copying aurora browser, chat, editor
authorsmo <smolejv@gmx.net>
Sat, 02 Jun 2012 09:24:16 +0200
changeset 198 24feeb838697f2b0dd58262f4967f365549e032d
parent 197 e63b16bd2c642a069a31ee01400e84ebb41ec001
child 199 61787469a86463ee1977d6bb698fba3e13d9c2c7
push id110
push usersmolejv@gmx.net
push dateSat, 02 Jun 2012 07:25:46 +0000
copying aurora browser, chat, editor
browser/branding/official/brand.dtd
browser/branding/official/brand.properties
browser/chrome/browser/aboutDialog.dtd
browser/chrome/browser/aboutHome.dtd
browser/chrome/browser/aboutPrivateBrowsing.dtd
browser/chrome/browser/aboutRobots.dtd
browser/chrome/browser/aboutSessionRestore.dtd
browser/chrome/browser/browser.dtd
browser/chrome/browser/browser.properties
browser/chrome/browser/devtools/debugger.dtd
browser/chrome/browser/devtools/debugger.properties
browser/chrome/browser/devtools/gcli.properties
browser/chrome/browser/devtools/gclicommands.properties
browser/chrome/browser/devtools/inspector.properties
browser/chrome/browser/devtools/scratchpad.dtd
browser/chrome/browser/devtools/scratchpad.properties
browser/chrome/browser/devtools/sourceeditor.dtd
browser/chrome/browser/devtools/sourceeditor.properties
browser/chrome/browser/devtools/styleeditor.dtd
browser/chrome/browser/devtools/styleeditor.properties
browser/chrome/browser/devtools/styleinspector.dtd
browser/chrome/browser/devtools/styleinspector.properties
browser/chrome/browser/devtools/tilt.properties
browser/chrome/browser/devtools/webConsole.dtd
browser/chrome/browser/devtools/webconsole.properties
browser/chrome/browser/feeds/subscribe.properties
browser/chrome/browser/migration/migration.dtd
browser/chrome/browser/migration/migration.properties
browser/chrome/browser/newTab.dtd
browser/chrome/browser/newTab.properties
browser/chrome/browser/openLocation.dtd
browser/chrome/browser/pageInfo.dtd
browser/chrome/browser/pageInfo.properties
browser/chrome/browser/places/bookmarkProperties.properties
browser/chrome/browser/places/places.dtd
browser/chrome/browser/places/places.properties
browser/chrome/browser/preferences/aboutPermissions.dtd
browser/chrome/browser/preferences/aboutPermissions.properties
browser/chrome/browser/preferences/advanced-scripts.dtd
browser/chrome/browser/preferences/advanced.dtd
browser/chrome/browser/preferences/colors.dtd
browser/chrome/browser/preferences/content.dtd
browser/chrome/browser/preferences/fonts.dtd
browser/chrome/browser/preferences/languages.dtd
browser/chrome/browser/preferences/main.dtd
browser/chrome/browser/preferences/preferences.dtd
browser/chrome/browser/preferences/preferences.properties
browser/chrome/browser/preferences/privacy.dtd
browser/chrome/browser/preferences/security.dtd
browser/chrome/browser/preferences/sync.dtd
browser/chrome/browser/quitDialog.properties
browser/chrome/browser/safeMode.dtd
browser/chrome/browser/setDesktopBackground.dtd
browser/chrome/browser/syncBrand.dtd
browser/chrome/browser/syncGenericChange.properties
browser/chrome/browser/syncKey.dtd
browser/chrome/browser/syncProgress.dtd
browser/chrome/browser/syncQuota.properties
browser/chrome/browser/syncSetup.dtd
browser/chrome/browser/syncSetup.properties
browser/chrome/browser/tabview.properties
browser/chrome/overrides/appstrings.properties
browser/chrome/overrides/netError.dtd
browser/defines.inc
browser/feedback/main.dtd
browser/feedback/main.properties
browser/installer/custom.properties
browser/installer/mui.properties
browser/installer/override.properties
browser/profile/bookmarks.inc
browser/updater/updater.ini
chat/accounts.properties
chat/commands.properties
chat/conversations.properties
chat/facebook.properties
chat/irc.properties
chat/status.properties
chat/twitter.properties
chat/xmpp.properties
editor/ui/chrome/composer/editingOverlay.dtd
editor/ui/chrome/composer/editor.dtd
editor/ui/chrome/composer/editor.properties
editor/ui/chrome/composer/editorOverlay.dtd
editor/ui/chrome/dialogs/EdDialogOverlay.dtd
editor/ui/chrome/dialogs/EditConflict.dtd
editor/ui/chrome/dialogs/EditorColorProperties.dtd
editor/ui/chrome/dialogs/EditorHLineProperties.dtd
editor/ui/chrome/dialogs/EditorImageProperties.dtd
editor/ui/chrome/dialogs/EditorPageProperties.dtd
editor/ui/chrome/dialogs/EditorPublish.dtd
editor/ui/chrome/dialogs/EditorSpellCheck.dtd
new file mode 100644
--- /dev/null
+++ b/browser/branding/official/brand.dtd
@@ -0,0 +1,4 @@
+<!ENTITY  brandShortName        "Firefox">
+<!ENTITY  brandFullName         "Mozilla Firefox">
+<!ENTITY  vendorShortName       "Mozilla">
+<!ENTITY  trademarkInfo.part1   "Firefox in logotip Firefoxa sta blagovni znamki Mozilla Foundation.">
\ No newline at end of file
new file mode 100644
--- /dev/null
+++ b/browser/branding/official/brand.properties
@@ -0,0 +1,11 @@
+brandShortName=Firefox
+brandFullName=Mozilla Firefox
+vendorShortName=Mozilla
+
+homePageSingleStartMain=Firefox Start, hitra domača stran z vgrajenim iskalnikom
+homePageImport=Uvozi mojo domačo stran iz programa %S
+
+homePageMigrationPageTitle=Izbor domače strani
+homePageMigrationDescription=Prosim, izberite domačo stran, ki jo želite uporabljati:
+
+syncBrandShortName=Usklajevanje
--- a/browser/chrome/browser/aboutDialog.dtd
+++ b/browser/chrome/browser/aboutDialog.dtd
@@ -1,17 +1,31 @@
 <!ENTITY aboutDialog.title          "O &brandFullName;u">
 
+<!-- LOCALIZATION NOTE (warningDesc.version): This is a warning about the experimental nature of Nightly and Aurora builds. It is only shown in those versions. -->
+<!ENTITY warningDesc.version        "Izdaja &brandShortName; je poskusna in lahko deluje nezanesljivo.">
+<!-- LOCALIZATION NOTE (warningDesc.telemetry): This is a notification that Nightly/Aurora builds automatically send Telemetry data back to Mozilla. It is only shown in those versions. "It" refers to brandShortName. -->
+<!ENTITY warningDesc.telemetry      "Samodejno pošilja podatke neprofitni organizaciji &vendorShortName;, da bi bila izdaja &brandShortName; še boljša.">
+
+<!-- LOCALIZATION NOTE (community.exp.*) This paragraph is shown in "experimental" builds, i.e. Nightly and Aurora builds, instead of the other "community.*" strings below. -->
+<!ENTITY community.exp.start        "">
+<!-- LOCALIZATION NOTE (community.exp.mozillaLink): This is a link title that links to http://www.mozilla.org/. -->
+<!ENTITY community.exp.mozillaLink  "&vendorShortName;">
+<!ENTITY community.exp.middle       " je ">
+<!-- LOCALIZATION NOTE (community.exp.creditslink): This is a link title that links to about:credits. -->
+<!ENTITY community.exp.creditsLink  "globalna skupnost,">
+<!ENTITY community.exp.end          " ki si prizadeva, da bi splet ostal odprt, javen in dostopen vsem.">
+
 <!ENTITY community.start2           "&brandShortName; razvija ">
 <!-- LOCALIZATION NOTE (community.mozillaLink): This is a link title that links to http://www.mozilla.org/. -->
 <!ENTITY community.mozillaLink      "&vendorShortName;">
 <!ENTITY community.middle2          ", ">
 <!-- LOCALIZATION NOTE (community.creditsLink): This is a link title that links to about:credits. -->
 <!ENTITY community.creditsLink      "globalna skupnost, ">
-<!ENTITY community.end2             " ki si prizadeva za boljši internet. Verjamemo, da mora biti internet odprt, javen ter dostopen vsem in brez omejitev.">
+<!ENTITY community.end3             " ki si prizadeva, da bi splet ostal odprt, javen in dostopen vsem.">
 
 <!ENTITY contribute.start           "Se vam sliši zanimivo? ">
 <!-- LOCALIZATION NOTE (contribute.getInvolvedLink): This is a link title that links to http://www.mozilla.org/contribute/. -->
 <!ENTITY contribute.getInvolvedLink "Pridružite se nam!">
 <!ENTITY contribute.end             "">
 
 <!-- LOCALIZATION NOTE (bottomLinks.license): This is a link title that links to about:license. -->
 <!ENTITY bottomLinks.license        "Dovoljenja">
@@ -49,8 +63,14 @@
 
 <!-- LOCALIZATION NOTE (update.downloading.start,update.downloading.end): update.downloading.start and 
      update.downloading.end all go into one line, with the amount downloaded inserted in between. As this
      is all in one line, try to make the localized text short (see bug 596813 for screenshots). The — is
      the "em dash" (long dash).
      example: Downloading update — 111 KB of 13 MB -->
 <!ENTITY update.downloading.start   "Prenašanje posodobitev — ">
 <!ENTITY update.downloading.end     "">
+
+<!-- LOCALIZATION NOTE (channel.description.start,channel.description.end): channel.description.start and
+     channel.description.end create one sentence, with the current channel label inserted in between.
+     example: You are currently on the _Stable_ update channel. -->
+<!ENTITY channel.description.start  "Uporabljate posodobitveni kanal ">
+<!ENTITY channel.description.end    ". ">
--- a/browser/chrome/browser/aboutHome.dtd
+++ b/browser/chrome/browser/aboutHome.dtd
@@ -1,20 +1,27 @@
-<!ENTITY % brandDTD
-    SYSTEM "chrome://branding/locale/brand.dtd">
-  %brandDTD;
+<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
+%brandDTD;
+<!ENTITY % syncBrandDTD SYSTEM "chrome://browser/locale/syncBrand.dtd">
+%syncBrandDTD;
 
 <!-- These strings are used in the about:home page -->
 
 <!ENTITY abouthome.pageTitle "&brandFullName;: domača stran">
 
 <!ENTITY abouthome.searchEngineButton.label "Iskanje">
 
-<!ENTITY abouthome.aboutMozilla "O Mozilli">
-
 <!-- LOCALIZATION NOTE (abouthome.defaultSnippet1.v1):
      text in <a/> will be linked to the Firefox features page on mozilla.com
 -->
 <!ENTITY abouthome.defaultSnippet1.v1 "Hvala, da ste izbrali Firefox! Da bi kar najbolje izkoristili vaš brskalnik, spoznajte <a>zadnje novosti</a>.">
 <!-- LOCALIZATION NOTE (abouthome.defaultSnippet2.v1):
      text in <a/> will be linked to the featured add-ons on addons.mozilla.org
 -->
 <!ENTITY abouthome.defaultSnippet2.v1 "Firefox lahko na preprost način prilagodite svojim željam. <a>Izbirate lahko med tisoči dodatkov</a>.">
+
+<!ENTITY abouthome.bookmarksButton.label "Zaznamki">
+<!ENTITY abouthome.historyButton.label   "Zgodovina">
+<!ENTITY abouthome.settingsButton.label  "Nastavitve">
+<!ENTITY abouthome.addonsButton.label    "Dodatki">
+<!ENTITY abouthome.appsButton.label      "Marketplace">
+<!ENTITY abouthome.downloadsButton.label "Prenosi">
+<!ENTITY abouthome.syncButton.label      "&syncBrand.shortName.label;">
--- a/browser/chrome/browser/aboutPrivateBrowsing.dtd
+++ b/browser/chrome/browser/aboutPrivateBrowsing.dtd
@@ -1,24 +1,24 @@
 <!ENTITY privatebrowsingpage.title                 "Zasebno brskanje">
 <!ENTITY privatebrowsingpage.title.normal          "Ali želite vključiti zasebno brskanje?">
 
 <!ENTITY privatebrowsingpage.issueDesc                 "&brandShortName; za to sejo ne bo hranil zgodovine.">
 <!ENTITY privatebrowsingpage.issueDesc.normal          "&brandShortName; trenutno ni v načinu za zasebno brskanje.">
 
-<!ENTITY privatebrowsingpage.description               "&brandShortName; med zasebnim brskanjem ne bo shranjeval zgodovine brskanja, iskanja, prenosov in spletnih obrazcev, piškotov ter začasnih datotek.  Datoteke, ki jih boste prenesli, in zaznamki, ki jih boste ustvarili, pa se bodo ohranili.">
+<!ENTITY privatebrowsingpage.description               "&brandShortName; med zasebnim brskanjem ne bo shranjeval zgodovine brskanja, iskanja, prenosov in spletnih obrazcev, piškotov ter začasnih datotek. Datoteke, ki jih boste prenesli, in zaznamki, ki jih boste ustvarili, pa se bodo ohranili.">
 
 <!-- LOCALIZATION NOTE (privatebrowsingpage.clearRecentHistoryBefore): include a trailing space as needed -->
 <!-- LOCALIZATION NOTE (privatebrowsingpage.clearRecentHistoryAfter): include a starting space as needed -->
 <!ENTITY privatebrowsingpage.clearRecentHistoryBefore  "Pred zagonom lahko zbrišete ">
 <!ENTITY privatebrowsingpage.clearRecentHistoryInner   " tudi vašo nedavno zgodovino">
 <!ENTITY privatebrowsingpage.clearRecentHistoryAfter   ".">
 
 <!ENTITY privatebrowsingpage.startPrivateBrowsing.label "Vključi zasebno brskanje">
 <!ENTITY privatebrowsingpage.startPrivateBrowsing.accesskey "Z">
 
 <!-- LOCALIZATION NOTE (privatebrowsingpage.howToStop2): please leave &basePBMenu.label; intact in the translation -->
 <!-- LOCALIZATION NOTE (privatebrowsingpage.howToStart2): please leave &basePBMenu.label; intact in the translation -->
 <!ENTITY privatebrowsingpage.howToStop2                "Zasebno brskanje lahko izključite tudi z izbiro &basePBMenu.label; &gt; &privateBrowsingCmd.stop.label;, ali z zapiranjem &brandShortName;a.">
 <!ENTITY privatebrowsingpage.howToStart2               "Zasebno brskanje lahko vključite tudi z izbiro &basePBMenu.label; &gt; &privateBrowsingCmd.start.label;.">
 
-<!ENTITY privatebrowsingpage.moreInfo                  "Kljub temu da ta računalnik ne bo hranil zgodovine brskanja, lahko vaš ponudnik internetnih storitev še vedno sledi stranem, ki ste jih obsikali.">
+<!ENTITY privatebrowsingpage.moreInfo                  "Kljub temu da ta računalnik ne bo hranil zgodovine brskanja, lahko vaš ponudnik internetnih storitev še vedno sledi stranem, ki ste jih obiskali.">
 <!ENTITY privatebrowsingpage.learnMore                 "Več o tem">
--- a/browser/chrome/browser/aboutRobots.dtd
+++ b/browser/chrome/browser/aboutRobots.dtd
@@ -1,27 +1,27 @@
 <!-- These strings are used in the about:robots page, which ties in with the
      robots theme used in the Firefox 3 Beta 2/3 first run pages...
          https://www.mozilla.com/en-US/firefox/3.0b2/firstrun/
          https://www.mozilla.com/en-US/firefox/3.0b3/firstrun/
      They're just meant to be fun and whimsical, with references to some geeky
      but well-known robots in movies and books. Be creative with translations! -->
+
 <!-- Nonsense line from the movie "The Day The Earth Stood Still". No translation needed. -->
-
-<!ENTITY robots.pagetitle "Gort! Klaatu barada nikto!">
+<!ENTITY robots.pagetitle  "Gort! Klaatu barada nikto!">
 <!-- Movie: Logan's Run... Box (cybog): "Welcome Humans! I am ready for you." -->
-<!ENTITY robots.errorTitleText "Pozdravljeni ljudje!">
+<!ENTITY robots.errorTitleText "Pozdravljeni človeki! Sem pripravljeno k vas.">
 <!-- Movie: The Day The Earth Stood Still. Spoken by Klaatu. -->
 <!ENTITY robots.errorShortDescText "K vam prihajamo v miru in z dobro voljo!">
 <!-- Various books by Isaac Asimov. http://en.wikipedia.org/wiki/Three_Laws_of_Robotics -->
-<!ENTITY robots.errorLongDesc1 "Roboti ne smejo poškodovati človeka ali iz malomarnosti dovoliti, da bi se poškodoval.">
+<!ENTITY robots.errorLongDesc1 "Roboti ne smejo škoditi človeku ali iz malomarnosti dovoliti, da bi se poškodoval.">
 <!-- Movie: Blade Runner. Batty: "I've seen things you people wouldn't believe..." -->
 <!ENTITY robots.errorLongDesc2 "Roboti smo videli stvari, o katerih nam ljudje ne bi verjeli.">
 <!-- Book: Hitchiker's Guide To The Galaxy. What the Sirius Cybernetics Corporation calls robots. -->
 <!ENTITY robots.errorLongDesc3 "Roboti so vaši plastični prijatelji, s katerimi je lepo.">
 <!-- TV: Futurama. Bender's first line is "Bite my shiny metal ass." -->
-<!ENTITY robots.errorLongDesc4 "Roboti imajo svetleče kovinsko ogrodje, ki se ga ne sme ugrizniti.">
+<!ENTITY robots.errorLongDesc4 "Piši se mi v mojo svetlečo kovinsko rit.">
 <!-- TV: Battlestar Galactica (2004 series). From the opening text. -->
 <!ENTITY robots.errorTrailerDescText "In imajo načrt.">
 <!-- TV: Battlestar Galactica (2004 series). Common expletive referring to Cylons. -->
 <!ENTITY robots.imgtitle "Frakkin' Toasters">
 <!-- Book: Hitchiker's Guide To The Galaxy. Arthur presses a button and it warns him. -->
 <!ENTITY robots.dontpress "Prosim, ne klikajte na ta gumb.">
--- a/browser/chrome/browser/aboutSessionRestore.dtd
+++ b/browser/chrome/browser/aboutSessionRestore.dtd
@@ -9,11 +9,11 @@
 <!ENTITY restorepage.startNew       "Začnite povsem novo sejo brskanja">
 
 <!ENTITY restorepage.tryagainButton "Obnovi">
 <!ENTITY restorepage.restore.access "O">
 <!ENTITY restorepage.cancelButton   "Začni novo sejo">
 <!ENTITY restorepage.cancel.access  "S">
 
 <!ENTITY restorepage.restoreHeader  "Obnovi">
-<!ENTITY restorepage.listHeader     "Okna in zavihke">
+<!ENTITY restorepage.listHeader     "Okna in zavihki">
 <!-- LOCALIZATION NOTE: &#37;S will be replaced with a number. -->
 <!ENTITY restorepage.windowLabel    "Okno &#37;S">
--- a/browser/chrome/browser/browser.dtd
+++ b/browser/chrome/browser/browser.dtd
@@ -28,17 +28,16 @@ can reach it easily. -->
 <!ENTITY  pinAppTab.accesskey                "P">
 <!ENTITY  unpinAppTab.label                  "Odpni zavihek">
 <!ENTITY  unpinAppTab.accesskey              "O">
 <!ENTITY  moveToGroup.label                  "Premakni v skupino">
 <!ENTITY  moveToGroup.accesskey              "m">
 <!ENTITY  moveToNewGroup.label               "Nova skupina">
 <!ENTITY  moveToNewWindow.label              "Premakni v novo okno">
 <!ENTITY  moveToNewWindow.accesskey          "k">
-
 <!ENTITY  bookmarkAllTabs.label              "Dodaj vse zavihke med zaznamke …">
 <!ENTITY  bookmarkAllTabs.accesskey          "v">
 <!ENTITY  undoCloseTab.label                 "Prekliči zapiranje zavihka">
 <!ENTITY  undoCloseTab.accesskey             "h">
 <!ENTITY  closeTab.label                     "Zapri zavihek">
 <!ENTITY  closeTab.accesskey                 "Z">
 
 <!ENTITY  listAllTabs.label      "Seznam vseh zavihkov">
@@ -53,18 +52,16 @@ can reach it easily. -->
 <!ENTITY openFileCmd.commandkey "o">
 <!ENTITY printSetupCmd.label "Priprava strani …">
 <!ENTITY printSetupCmd.accesskey "r">
 <!ENTITY printPreviewCmd.label "Predogled tiskanja">
 <!ENTITY printPreviewCmd.accesskey "d">
 <!ENTITY printCmd.label "Natisni …">
 <!ENTITY printCmd.accesskey "N">
 <!ENTITY printCmd.commandkey "p">
-<!ENTITY import.label "Uvozi …">
-<!ENTITY import.accesskey "I">
 
 <!ENTITY goOfflineCmd.label "Nepovezan način">
 <!ENTITY goOfflineCmd.accesskey "n">
 
 <!ENTITY menubarCmd.label "Vrstica z menijem">
 <!ENTITY menubarCmd.accesskey "M">
 <!ENTITY navbarCmd.label "Vrstica za brskanje">
 <!ENTITY navbarCmd.accesskey "b">
@@ -75,50 +72,53 @@ can reach it easily. -->
 <!ENTITY addonBarCmd.accesskey "D">
 
 <!ENTITY pageSourceCmd.label "Izvorna koda strani">
 <!ENTITY pageSourceCmd.accesskey "o">
 <!ENTITY pageSourceCmd.commandkey "u">
 <!ENTITY pageInfoCmd.label "Podatki o strani">
 <!ENTITY pageInfoCmd.accesskey "I">
 <!ENTITY pageInfoCmd.commandkey "i">
-<!ENTITY fullScreenCmd.label "Celozaslonski način">
+<!ENTITY fullScreenCmd.label "Celoten zaslon">
 <!ENTITY fullScreenCmd.accesskey "C">
-<!ENTITY fullScreenCmd.macCommandKey "c">
+<!ENTITY fullScreenCmd.macCommandKey "f">
 <!ENTITY showAllTabsCmd.label "Prikaži vse zavihke">
 <!ENTITY showAllTabsCmd.accesskey "A">
 
 <!ENTITY fullScreenMinimize.tooltip "Skrči">
 <!ENTITY fullScreenRestore.tooltip "V običajen način">
 <!ENTITY fullScreenClose.tooltip "Zapri">
 <!ENTITY fullScreenAutohide.label "Skrij orodne vrstice">
 <!ENTITY fullScreenAutohide.accesskey "S">
-<!ENTITY fullScreenExit.label "Izhod iz celozaslonskega načina">
+<!ENTITY fullScreenExit.label "Končaj celoten zaslon">
 <!ENTITY fullScreenExit.accesskey "C">
+<!ENTITY domFullScreenWarning.label "Pritisnite ESC za izhod iz celotnega zaslona">
 
 <!ENTITY closeWindow.label "Zapri okno">
 <!ENTITY closeWindow.accesskey "o">
 
 <!ENTITY bookmarksMenu.label "Zaznamki">
 <!ENTITY bookmarksMenu.accesskey "Z">
 <!ENTITY bookmarkThisPageCmd.label "Dodaj stran med zaznamke">
 <!ENTITY bookmarkThisPageCmd.commandkey "d">
 <!ENTITY subscribeToPageMenupopup.label "Naroči se na to stran">
 <!ENTITY subscribeToPageMenuitem.label "Naroči se na to stran …">
 <!ENTITY addCurPagesCmd.label "Dodaj vse zavihke med zaznamke …">
 <!ENTITY showAllBookmarks2.label "Prikaži vse zaznamke">
-<!ENTITY bookmarkAllCmd.label "Dodaj vse zavihke med zaznamke …">
+<!ENTITY unsortedBookmarksCmd.label "Nerazvrščeni zaznamki">
 <!ENTITY bookmarksToolbarChevron.tooltip "Prikaži več zaznamkov">
 
 <!ENTITY backCmd.label "Nazaj">
 <!ENTITY backCmd.accesskey "N">
 <!ENTITY backButton.tooltip "Pojdi na prejšnjo stran">
 <!ENTITY forwardCmd.label "Naprej">
 <!ENTITY forwardCmd.accesskey "P">
 <!ENTITY forwardButton.tooltip "Pojdi na naslednjo stran">
+<!ENTITY backForwardButtonMenu.tooltip "Desno kliknite ali potegnite navzdol za prikaz zgodovine">
+<!ENTITY backForwardButtonMenuMac.tooltip "Potegnite navzdol za prikaz zgodovine">
 <!ENTITY reloadCmd.label "Ponovno naloži">
 <!ENTITY reloadCmd.accesskey "P">
 <!ENTITY reloadButton.tooltip "Ponovno naloži trenutno stran">
 <!ENTITY stopCmd.label "Ustavi">
 <!ENTITY stopCmd.accesskey "S">
 <!ENTITY stopCmd.macCommandKey ".">
 <!ENTITY stopButton.tooltip "Prenehaj z nalaganjem te strani">
 <!ENTITY goEndCap.tooltip "Odpri mesto v naslovnem polju">
@@ -128,17 +128,17 @@ can reach it easily. -->
 <!ENTITY backForwardItem.title        "Nazaj/Naprej">
 <!ENTITY locationItem.title "Naslov">
 <!ENTITY searchItem.title "Iskanje">
 <!ENTITY throbberItem.title "Merilnik dejavnosti">
 <!ENTITY bookmarksItem.title "Zaznamki">
 
 <!-- Toolbar items --> 
 <!ENTITY appMenuButton.label          "Meni">
-<!ENTITY appMenuButton.tooltip        "Odpri meni &brandShortName;a">
+<!ENTITY appMenuButton.tooltip        "Odpri meni &brandShortName;">
 <!ENTITY homeButton.label "Domov">
 
 <!ENTITY tabGroupsButton.label        "Skupine zavihkov">
 <!ENTITY tabGroupsButton.tooltip      "Združite svoje zavihke">
 
 <!ENTITY feedButton.label             "Naroči se">
 <!ENTITY feedButton.tooltip           "Naroči se na to stran …">
 
@@ -175,44 +175,78 @@ can reach it easily. -->
 <!ENTITY downloads.tooltip "Prikaži napredek trenutnih prenosov">
 <!ENTITY downloads.accesskey "P">
 <!ENTITY downloads.commandkey "j">
 <!ENTITY downloadsUnix.commandkey "y">
 <!ENTITY addons.label "Dodatki">
 <!ENTITY addons.accesskey "D">
 <!ENTITY addons.commandkey            "A">
 
+<!ENTITY webDeveloperMenu.label       "Spletni razvoj">
+<!ENTITY webDeveloperMenu.accesskey   "S">
+
 <!ENTITY errorConsoleCmd.label "Konzola JavaScript">
 <!ENTITY errorConsoleCmd.accesskey "C">
 <!ENTITY errorConsoleCmd.commandkey "j">
 
 <!ENTITY webConsoleCmd.label          "Spletna konzola">
 <!ENTITY webConsoleCmd.accesskey      "l">
 <!ENTITY webConsoleCmd.commandkey     "k">
 
 <!ENTITY inspectMenu.label            "Preglej">
 <!ENTITY inspectMenu.accesskey        "g">
 <!ENTITY inspectMenu.commandkey       "I">
 
-<!ENTITY inspectPanelTitle.label      "HTML">
-<!ENTITY inspectButton.label          "Preglej">
-<!ENTITY inspectButton.accesskey      "P">
-<!ENTITY inspectNextButton.label      "Naprej">
-<!ENTITY inspectNextButton.accesskey  "N">
-<!ENTITY inspectPreviousButton.label  "Nazaj">
-<!ENTITY inspectPreviousButton.accesskey "z">
+<!ENTITY inspectContextMenu.label     "Preglej element">
+<!ENTITY inspectContextMenu.accesskey "j">
+
+<!-- LOCALIZATION NOTE (scratchpad.label): This menu item label appears
+  -  in the Tools menu. See bug 653093.
+  -  The Scratchpad is intended to provide a simple text editor for creating
+  -  and evaluating bits of JavaScript code for the purposes of function
+  -  prototyping, experimentation and convenient scripting.
+  -
+  -  It's quite possible that you won't have a good analogue for the word
+  -  "Scratchpad" in your locale. You should feel free to find a close
+  -  approximation to it or choose a word (or words) that means
+  -  "simple discardable text editor". -->
+<!ENTITY scratchpad.label             "Beležnica">
+<!ENTITY scratchpad.accesskey         "B">
+<!ENTITY scratchpad.keycode           "VK_F4">
+<!ENTITY scratchpad.keytext           "F4">
+
+<!ENTITY inspectCloseButton.tooltiptext "Zapri pregledovalnik">
+
+<!ENTITY inspectorHTMLCopyInner.label       "Kopiraj notranji HTML">
+<!ENTITY inspectorHTMLCopyInner.accesskey   "I">
+
+<!ENTITY inspectorHTMLCopyOuter.label       "Kopiraj zunanji HTML">
+<!ENTITY inspectorHTMLCopyOuter.accesskey   "O">
+
+<!ENTITY inspectorHTMLDelete.label          "Odstrani element">
+<!ENTITY inspectorHTMLDelete.accesskey      "D">
+
+<!-- LOCALIZATION NOTE (inspect3DViewButton.label): This button shows an
+  -  alternate view for the Inspector, creating a 3D visualization of the
+  -  webpage. -->
+<!ENTITY inspect3DViewButton.label     "Pogled 3D">
+<!ENTITY inspect3DViewButton.accesskey "D">
+
 <!ENTITY inspectStyleButton.label     "Slog">
 <!ENTITY inspectStyleButton.accesskey "S">
-<!ENTITY inspectStylePanelTitle.label  "Slog">
-<!-- LOCALIZATION NOTE (inspectObjectButton.label): This button label
-  -  appears on the Inspector's toolbar. It is used to open and close the Object
-  -  panel. There is also a label in inspector.properties for the panel
-  -  titlebar: object.objectPanelTitle. -->
-<!ENTITY inspectObjectButton.label       "Objekt">
-<!ENTITY inspectObjectButton.accesskey   "O">
+
+<!-- LOCALIZATION NOTE (styleeditor.label): This menu item label appears
+  -  in the Tools menu. -->
+<!ENTITY styleeditor.label            "Urejevalnik sloga">
+<!ENTITY styleeditor.accesskey        "U">
+<!ENTITY styleeditor.keycode          "VK_F7">
+<!ENTITY styleeditor.keytext          "F7">
+
+<!ENTITY getMoreDevtoolsCmd.label        "Prenesi več orodij">
+<!ENTITY getMoreDevtoolsCmd.accesskey    "r">
 
 <!ENTITY fileMenu.label "Datoteka">
 <!ENTITY fileMenu.accesskey "D">
 <!ENTITY newNavigatorCmd.label "Novo okno">
 <!ENTITY newNavigatorCmd.key "N">
 <!ENTITY newNavigatorCmd.accesskey "N">
 
 <!ENTITY editMenu.label "Urejanje">
@@ -292,32 +326,34 @@ can reach it easily. -->
 <!ENTITY urlbar.placeholder           "Obiščite spletno stran">
 <!ENTITY urlbar.accesskey             "d">
 <!ENTITY urlbar.switchToTab.label     "Preklopi na zavihek:">
 
 <!-- 
   Comment duplicated from browser-sets.inc:
 
   Search Command Key Logic works like this:
-  
+
   Unix: Ctrl+J (0.8, 0.9 support)
         Ctrl+K (cross platform binding)
   Mac:  Cmd+K (cross platform binding)
         Cmd+Opt+F (platform convention)
   Win:  Ctrl+K (cross platform binding)
+        Ctrl+E (IE compat)
 
   We support Ctrl+K on all platforms now and advertise it in the menu since it is
   our standard - it is a "safe" choice since it is near no harmful keys like "W" as
   "E" is. People mourning the loss of Ctrl+K for emacs compat can switch their GTK
   system setting to use emacs emulation, and we should respect it. Focus-Search-Box
   is a fundamental keybinding and we are maintaining a XP binding so that it is easy
   for people to switch to Linux.
 
  -->
 <!ENTITY searchFocus.commandkey "k">
+<!ENTITY searchFocus.commandkey2      "e">
 <!ENTITY searchFocusUnix.commandkey "j">
 
 <!ENTITY tabView.commandkey           "e">
 
 <!ENTITY openLinkCmd.label "Odpri povezavo v novem oknu">
 <!ENTITY openLinkCmd.accesskey "N">
 <!ENTITY openLinkCmdInCurrent.label     "Odpri povezavo">
 <!ENTITY openLinkCmdInCurrent.accesskey "O">
@@ -413,19 +449,24 @@ can reach it easily. -->
 <!ENTITY mediaMute.label             "Nemo">
 <!ENTITY mediaMute.accesskey         "N">
 <!ENTITY mediaUnmute.label           "Glasno">
 <!ENTITY mediaUnmute.accesskey       "n">
 <!ENTITY mediaShowControls.label     "Prikaži gradnike">
 <!ENTITY mediaShowControls.accesskey "g">
 <!ENTITY mediaHideControls.label     "Skrij gradnike">
 <!ENTITY mediaHideControls.accesskey "g">
-<!ENTITY videoFullScreen.label       "Celozaslonski način">
+<!ENTITY videoFullScreen.label       "Celoten zaslon">
 <!ENTITY videoFullScreen.accesskey   "C">
-
+<!ENTITY videoSaveImage.label        "Shrani posnetek kot …">
+<!ENTITY videoSaveImage.accesskey    "S">
+<!ENTITY videoShowStats.label        "Prikaži statistiko">
+<!ENTITY videoShowStats.accesskey    "t">
+<!ENTITY videoHideStats.label        "Skrij statistiko">
+<!ENTITY videoHideStats.accesskey    "t">
 
 <!-- LOCALIZATION NOTE :
 fullZoomEnlargeCmd.commandkey3, fullZoomReduceCmd.commandkey2 and
 fullZoomResetCmd.commandkey2 are alternative acceleration keys for zoom.
 If shift key is needed with your locale popular keyboard for them,
 you can use these alternative items. Otherwise, their values should be empty.  -->
 
 <!ENTITY fullZoomEnlargeCmd.label "Povečaj">
@@ -452,17 +493,17 @@ you can use these alternative items. Oth
 <!ENTITY newTabButton.tooltip           "Odpri nov zavihek">
 <!ENTITY newWindowButton.tooltip "Odpri novo okno">
 <!ENTITY sidebarCloseButton.tooltip "Zapri stransko vrstico">
 
 <!ENTITY cutButton.tooltip "Izreži">
 <!ENTITY copyButton.tooltip "Kopiraj">
 <!ENTITY pasteButton.tooltip "Prilepi">
 
-<!ENTITY fullScreenButton.tooltip       "Prikaži okno v celozaslonskem načinu">
+<!ENTITY fullScreenButton.tooltip       "Prikaži okno na celotnem zaslonu">
 
 <!ENTITY zoomOutButton.tooltip          "Pomanjšaj">
 <!ENTITY zoomInButton.tooltip           "Povečaj">
 <!ENTITY zoomControls.label             "Povečava">
 
 <!ENTITY quitApplicationCmdWin.label "Izhod">
 <!ENTITY quitApplicationCmdWin.accesskey "h">
 <!ENTITY goBackCmd.commandKey "[">
@@ -478,24 +519,24 @@ you can use these alternative items. Oth
 
 <!ENTITY pageStyleMenu.label "Slog strani">
 <!ENTITY pageStyleMenu.accesskey "g">
 <!ENTITY pageStyleNoStyle.label "Brez sloga">
 <!ENTITY pageStyleNoStyle.accesskey "b">
 <!ENTITY pageStylePersistentOnly.label "Osnovni slog strani">
 <!ENTITY pageStylePersistentOnly.accesskey "o">
 
-<!ENTITY pageReportIcon.tooltip "Spremeni nastavitve prepovedovanja nezahtevanih oken za to stran">
+<!ENTITY pageReportIcon.tooltip "Spremeni nastavitve prepovedovanja neželenih oken za to stran">
 
 <!ENTITY allowPopups.accesskey "d">
 <!-- On Windows we use the term "Options" to describe settings, but
      on Linux and Mac OS X we use "Preferences" - carry that distinction
      over into this string, which is used in the "popup blocked" info bar . -->
-<!ENTITY editPopupSettingsUnix.label "Uredi nastavitve zavračanja nezahtevanih oken …">
-<!ENTITY editPopupSettings.label "Uredi možnosti zavračanja nezahtevanih oken …">
+<!ENTITY editPopupSettingsUnix.label "Uredi nastavitve zavračanja neželenih oken …">
+<!ENTITY editPopupSettings.label "Uredi možnosti zavračanja neželenih oken …">
 <!ENTITY editPopupSettings.accesskey "U">
 <!ENTITY dontShowMessage.accesskey "N">
 
 <!ENTITY bidiSwitchPageDirectionItem.label "Spremeni smer strani">
 <!ENTITY bidiSwitchPageDirectionItem.accesskey "s">
 <!ENTITY bidiSwitchTextDirectionItem.label "Spremeni smer besedila">
 <!ENTITY bidiSwitchTextDirectionItem.accesskey "b">
 <!ENTITY bidiSwitchTextDirectionItem.commandkey "X">
@@ -537,18 +578,30 @@ just addresses the organization to follo
 <!ENTITY allTabs.filter.emptyText "Zavihki iskanja">
 <!-- Name for the tabs toolbar as spoken by screen readers.
      The word "toolbar" is appended automatically and should not be contained below! -->
 <!ENTITY tabsToolbar.label "Zavihki brskalnika">
 
 <!-- LOCALIZATION NOTE (syncTabsMenu.label): This appears in the history menu -->
 <!ENTITY syncTabsMenu.label     "Zavihki ostalih računalnikov">
 
-<!ENTITY syncBrand.shortName.label  "Sinhronizacija">
+<!ENTITY syncBrand.shortName.label  "Usklajevanje">
 
 <!ENTITY syncSetup.label              "&syncBrand.shortName.label; …">
-<!ENTITY syncSetup.accesskey          "i">
-<!ENTITY syncSyncNowItem.label        "Sinhroniziraj zdaj">
-<!ENTITY syncSyncNowItem.accesskey    "j">
-<!ENTITY syncToolbarButton.label      "Sinhroniziraj">
+<!ENTITY syncSetup.accesskey          "u">
+<!ENTITY syncSyncNowItem.label        "Uskladi zdaj">
+<!ENTITY syncSyncNowItem.accesskey    "u">
+<!ENTITY syncToolbarButton.label      "Uskladi">
 
 <!ENTITY addonBarCloseButton.tooltip  "Zapri vrstico dodatkov">
-<!ENTITY toggleAddonBarCmd.key        "/">
\ No newline at end of file
+<!ENTITY toggleAddonBarCmd.key        "/">
+
+<!-- LOCALIZATION NOTE (htmlPanel.label): This is a label for a button that
+activates the Web Developer->Inspect UI's HTML Tree Panel. -->
+<!ENTITY htmlPanel.label              "HTML">
+
+<!-- LOCALIZATION NOTE (htmlPanel.tooltiptext): The text that appears when a user
+hovers over the HTML panel's toolbar button. -->
+<!ENTITY htmlPanel.tooltiptext        "Pano HTML">
+
+<!-- LOCALIZATION NOTE (htmlPanel.accesskey): The key bound to the HTML panel's
+toolbar button -->
+<!ENTITY htmlPanel.accesskey          "H">
--- a/browser/chrome/browser/browser.properties
+++ b/browser/chrome/browser/browser.properties
@@ -1,11 +1,9 @@
-nv_done=Končano
 nv_timeout=Pretečen čas
-nv_stopped=Ustavljeno
 openFile=Odpri datoteko
 
 droponhometitle=Nastavitev domače strani
 droponhomemsg=Želite ta dokument nastaviti za svojo novo domačo stran?
 
 # context menu strings
 
 # LOCALIZATION NOTE (contextMenuSearchText): %1$S is the search engine,
@@ -18,17 +16,17 @@ contextMenuSearchText.accesskey=I
 bookmarkAllTabsDefault=[ime mape]
 
 xpinstallPromptWarning=%S je strani %S preprečil vprašati, ali lahko na vaš računalnik namesti programsko opremo.
 xpinstallPromptAllowButton=Dovoli
 # Accessibility Note:
 # Be sure you do not choose an accesskey that is used elsewhere in the active context (e.g. main menu bar, submenu of the warning popup button)
 # See http://www.mozilla.org/access/keyboard/accesskey for details
 xpinstallPromptAllowButton.accesskey=O
-xpinstallDisabledMessageLocked=Namestitev programske opreme je vaš-a sistemski-a administrator-ka onemogočil-a.
+xpinstallDisabledMessageLocked=Namestitev programske opreme je vaš sistemski administrator onemogočil.
 xpinstallDisabledMessage=Namestitev programske opreme je trenutno onemogočena. Kliknite gumb Omogoči, če jo želite omogočiti, potem pa poskusite znova.
 xpinstallDisabledButton=Omogoči
 xpinstallDisabledButton.accesskey=O
 
 # LOCALIZATION NOTE (addonDownloading, addonDownloadCancelled, addonDownloadRestart):
 # Semi-colon list of plural forms. See:
 # http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # Also see https://bugzilla.mozilla.org/show_bug.cgi?id=570012 for mockups
@@ -79,46 +77,47 @@ lwthemePostInstallNotification.manageButton=Upravljanje tem …
 lwthemePostInstallNotification.manageButton.accesskey=U
 
 # LOCALIZATION NOTE (lwthemeNeedsRestart.message):
 # %S will be replaced with the new theme name.
 lwthemeNeedsRestart.message=Tema %S bo nameščena po ponovnem zagonu.
 lwthemeNeedsRestart.button=Ponovni zagon
 lwthemeNeedsRestart.accesskey=P
 
-popupWarning=%S je tej strani preprečil, da bi odprla nezahtevano okno.
-popupWarningMultiple=%S je tej strani preprečil, da bi odprla več nezahtevanih oken (%S).
+popupWarning=%S je tej strani preprečil, da bi odprla neželeno okno.
+popupWarningMultiple=%S je tej strani preprečil, da bi odprla več neželenih oken (%S).
 popupWarningButton=Možnosti
 popupWarningButton.accesskey=M
 popupWarningButtonUnix=Nastavitve
 popupWarningButtonUnix.accesskey=N
-popupAllow=Dovoli strani %S odpiranje nezahtevanih oken
-popupBlock=Prepovej strani %S odpiranje nezahtevanih oken
-popupWarningDontShowFromMessage=Ne prikazuj tega sporočila, ko so nezahtevana okna zavrnjena
-popupWarningDontShowFromLocationbar=Ne prikazuj obvestil, ko so nezahtevana okna zavrnjena
+popupAllow=Dovoli strani %S odpiranje neželenih oken
+popupBlock=Prepovej strani %S odpiranje neželenih oken
+popupWarningDontShowFromMessage=Ne prikazuj tega sporočila, ko so neželena okna zavrnjena
+popupWarningDontShowFromLocationbar=Ne prikazuj obvestil, ko so neželena okna zavrnjena
 popupShowPopupPrefix=Pokaži '%S'
 
 # missing plugin installer
-missingpluginsMessage.title=Za prikaz večpredstavnih vsebin na tej strani so potrebni nekateri dodatki, ki jih nimate nameščenih.
-missingpluginsMessage.button.label=Namesti manjkajoče dodatke ...
+missingpluginsMessage.title=Za prikaz večpredstavnih vsebin na tej strani so potrebni nekateri vstavki, ki jih nimate nameščenih.
+missingpluginsMessage.button.label=Namesti manjkajoče vstavke ...
 missingpluginsMessage.button.accesskey=N
 outdatedpluginsMessage.title=Nekateri vstavki, ki jih potrebuje ta stran, niso posodobljeni.
 outdatedpluginsMessage.updateButton.label=Posodobi vstavke ...
 outdatedpluginsMessage.updateButton.accesskey=P
 blockedpluginsMessage.title=Nekateri vstavki, ki jih potrebuje ta stran, so bili zavrnjeni za vašo večjo varnost.
 blockedpluginsMessage.infoButton.label=Podrobnosti ...
 blockedpluginsMessage.infoButton.accesskey=D
 blockedpluginsMessage.searchButton.label=Posodobi vstavke ...
 blockedpluginsMessage.searchButton.accesskey=P
 crashedpluginsMessage.title=Vstavek %S se je sesul.
 crashedpluginsMessage.reloadButton.label=Ponovno naloži stran
 crashedpluginsMessage.reloadButton.accesskey=O
 crashedpluginsMessage.submitButton.label=Pošlji poročilo o sesutju
 crashedpluginsMessage.submitButton.accesskey=S
 crashedpluginsMessage.learnMore=Več o tem …
+carbonFailurePluginsMessage.message=Ta stran potrebuje vstavek, ki deluje le v 32-bitnem načinu
 carbonFailurePluginsMessage.restartButton.label=Ponovni zagon v 32-bitnem načinu
 carbonFailurePluginsMessage.restartButton.accesskey=v
 
 # Sanitize
 # LOCALIZATION NOTE (sanitizeDialog2.everything.title): When "Time range to
 # clear" is set to "Everything", the Clear Recent History dialog's title is
 # changed to this.  See UI mockup and comment 11 at bug 480169 -->
 sanitizeDialog2.everything.title=Počisti vso zgodovino
@@ -226,40 +225,40 @@ pausedDownloads1=1 ustavljeni prenos;Ust
 editBookmarkPanel.pageBookmarkedTitle=Dodaj med zaznamke
 editBookmarkPanel.pageBookmarkedDescription=%S si bo trajno shranil to stran.
 editBookmarkPanel.bookmarkedRemovedTitle=Zaznamek odstranjen
 editBookmarkPanel.editBookmarkTitle=Uredi ta zaznamek
 
 # LOCALIZATION NOTE (editBookmark.removeBookmarks.label)
 # Semi-colon list of plural forms. Replacement for #1 is
 # the number of bookmarks to be removed.
+# If this causes problems with localization you can also do "Remove Bookmarks (#1)"
+# instead of "Remove #1 Bookmarks".
 editBookmark.removeBookmarks.label=Odstrani zaznamek;Odstrani zaznamke (#1)
 
 # Post Update Notifications
 pu.notifyButton.label=Podrobnosti …
 pu.notifyButton.accesskey=D
 # LOCALIZATION NOTE %S will be replaced by the short name of the application.
 puNotifyText=%S je bil posodobljen
 puAlertTitle=%S posodobljen
 puAlertText=Kliknite tukaj za podrobnosti
 
 # Geolocation UI
 
 # LOCALIZATION NOTE (geolocation.shareLocation geolocation.dontShareLocation): 
 #If you're having trouble with the word Share, please use Allow and Block in your language.
 geolocation.shareLocation=Objavi položaj
 geolocation.shareLocation.accesskey=a
-geolocation.dontShareLocation=Ne objavi
-geolocation.dontShareLocation.accesskey=o
-geolocation.alwaysShare=Vedno objavi
-geolocation.alwaysShare.accesskey=V
-geolocation.neverShare=Nikoli ne objavi
-geolocation.neverShare.accesskey=N
-geolocation.siteWantsToKnow=%S želi izvedeti vaš položaj.
-geolocation.fileWantsToKnow=Datoteka %S želi izvedeti vaš položaj.
+geolocation.alwaysShareLocation=Vedno objavi položaj
+geolocation.alwaysShareLocation.accesskey=V
+geolocation.neverShareLocation=Nikoli ne objavi položaja
+geolocation.neverShareLocation.accesskey=N
+geolocation.shareWithSite=Ali želite deliti vaš položaj s stranjo %S?
+geolocation.shareWithFile=Ali želite deliti vaš položaj z datoteko %S?
 # LOCALIZATION NOTE (geolocation.learnMore): Use the unicode ellipsis char, \u2026,
 # or use "..." if \u2026 doesn't suit traditions in your locale.
 geolocation.learnMore=Več o tem ...
 
 # Phishing/Malware Notification Bar.
 # LOCALIZATION NOTE (notAForgery, notAnAttack)
 # The two button strings will never be shown at the same time, so
 # it's okay for them to have the same access key
@@ -298,18 +297,50 @@ addKeywordTitleAutoFill=Išči %S
 tabView2.title=%S - Skupine zavihkov
 
 extensions.{972ce4c6-7e08-4474-a285-3208198ce6fd}.name=Privzeto
 extensions.{972ce4c6-7e08-4474-a285-3208198ce6fd}.description=Privzeta tema.
 
 # safeModeRestart
 safeModeRestartPromptTitle=Ponovno zaženi z onemogočenimi dodatki
 safeModeRestartPromptMessage=Ali ste prepričani, da želite onemogočiti vse dodatke in ponovno zagnati brskalnik?
+safeModeRestartButton=Ponovno zaženi
 
 # LOCALIZATION NOTE (browser.menu.showCharacterEncoding): Set to the string
 # "true" (spelled and capitalized exactly that way) to show the "Character
 # Encoding" menu in the main Firefox button on Windows. Any other value will
 # hide it. Regardless of the value of this setting, the "Character Encoding"
 # menu will always be accessible via the "Web Developer" menu.
 # This is not a string to translate; it just controls whether the menu shows
 # up in the Firefox button. If users frequently use the "Character Encoding"
 # menu, set this to "true". Otherwise, you can leave it as "false".
 browser.menu.showCharacterEncoding=false
+
+# LOCALIZATION NOTE (syncPromoNotification.bookmarks.label): This appears in
+# the add bookmark star panel.  %S will be replaced by syncBrandShortName.
+# The final space separates this text from the Learn More link.
+syncPromoNotification.bookmarks.description=Zaznamki so dostopni na vseh napravah, ki uporabljajo %S.\u0020
+# LOCALIZATION NOTE (syncPromoNotification.passwords.label): This appears in
+# the remember password panel.  %S will be replaced by syncBrandShortName.
+# The final space separates this text from the Learn More link.
+syncPromoNotification.passwords.description=Gesla so dostopna na vseh napravah, ki uporabljajo %S.\u0020
+syncPromoNotification.learnMoreLinkText=Več o tem
+
+# Telemetry prompt
+# LOCALIZATION NOTE (telemetryPrompt): %1$S will be replaced by brandFullName,
+# and %2$S by the value of the toolkit.telemetry.server_owner preference.
+telemetryPrompt = Ali želite sodelovati pri razvoju programa %1$S s samodejnim pošiljanjem podatkov o zmogljivosti, strojni opremi, načinu uporabe in prilagoditvah brskalnika na %2$S?
+telemetryLinkLabel = Več o tem
+telemetryYesButtonLabel2 = Da, želim sodelovati
+telemetryYesButtonAccessKey = D
+telemetryNoButtonLabel = Ne
+telemetryNoButtonAccessKey = N
+
+# Webapps notification popup
+webapps.install = Namesti
+webapps.install.accesskey = I
+#LOCALIZATION NOTE (webapps.requestInstall) %1$S is the web app name, %2$S is the site from which the web app is installed
+webapps.requestInstall = Ali želite namestiti "%1$S" iz te strani (%2$S)?
+
+# Telemetry opt-out prompt for Aurora and Nightly
+# LOCALIZATION NOTE (telemetryOptOutPrompt): %1$S and %3$S will be replaced by
+# brandFullName, and %2$S by the value of the toolkit.telemetry.server_owner preference.
+telemetryOptOutPrompt = %1$S pošilja podatke o delovanju, strojni opremi, načinu uporabe in prilagoditvah organizaciji %2$S, da bi lahko izboljšala %3$S.
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/devtools/debugger.dtd
@@ -0,0 +1,34 @@
+<!-- LOCALIZATION NOTE : FILE This file contains the Script Debugger strings -->
+<!-- LOCALIZATION NOTE : FILE Do not translate commandkey -->
+
+<!-- LOCALIZATION NOTE : FILE The correct localization of this file might be to
+  - keep it in English, or another language commonly spoken among web developers.
+  - You want to make that choice consistent across the developer tools.
+  - A good criteria is the language in which you'd find the best
+  - documentation on web development on the web. -->
+
+<!-- LOCALIZATION NOTE (debuggerMenu.label): This is the label for the
+  -  application menu item that opens the debugger UI. -->
+<!ENTITY debuggerMenu.label          "Iskalnik napak">
+
+<!-- LOCALIZATION NOTE (debuggerMenu.commandkey): This is the command key that
+  -  launches the debugger UI. Do not translate this one! -->
+<!ENTITY debuggerMenu.commandkey     "S">
+
+<!-- LOCALIZATION NOTE (debuggerUI.closeButton): This is the label for the
+  -  button that closes the debugger UI. -->
+<!ENTITY debuggerUI.closeButton      "Zapri">
+
+<!-- LOCALIZATION NOTE (debuggerUI.stackTitle): This is the label for the
+  -  widget that displays the call stack frames in the debugger. -->
+<!ENTITY debuggerUI.stackTitle       "Sklad klica">
+
+<!-- LOCALIZATION NOTE (debuggerUI.scriptTitle): This is the label for the
+  -  widget that displays the source code for the script that is currently
+  -  being inspected in the debugger. -->
+<!ENTITY debuggerUI.scriptTitle      "Skript">
+
+<!-- LOCALIZATION NOTE (debuggerUI.propertiesTitle): This is the label for the
+  -  widget that displays the variables in the various available scopes in the
+  -  debugger. -->
+<!ENTITY debuggerUI.propertiesTitle  "Obseg spremenljivk">
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/devtools/debugger.properties
@@ -0,0 +1,54 @@
+# LOCALIZATION NOTE These strings are used inside the Script Debugger
+# which is available from the Web Developer sub-menu -> 'Script Debugger'.
+# The correct localization of this file might be to keep it in
+# English, or another language commonly spoken among web developers.
+# You want to make that choice consistent across the developer tools.
+# A good criteria is the language in which you'd find the best
+# documentation on web development on the web.
+
+# LOCALIZATION NOTE (pauseLabel): The label that is displayed on the pause
+# button when the debugger is in a running state.
+pauseLabel=Ustavi
+
+# LOCALIZATION NOTE (resumeLabel): The label that is displayed on the pause
+# button when the debugger is in a paused state.
+resumeLabel=Nadaljuj
+
+# LOCALIZATION NOTE (pausedState): The label that is displayed when the
+# debugger is in a paused state.
+pausedState=Ustavljeno
+
+# LOCALIZATION NOTE (runningState): The label that is displayed when the
+# debugger is in a running state.
+runningState=Teče
+
+# LOCALIZATION NOTE (localScope): The label that is displayed in the variables
+# pane as a header on the local scope container.
+localScope=Lokalno
+
+# LOCALIZATION NOTE (globalScope): The label that is displayed in the variables
+# pane as a header on the globel scope container.
+globalScope=Globalno
+
+# LOCALIZATION NOTE (localScope): The label that is displayed in the variables
+# pane as a header on the container for identifiers in a with block.
+withScope=Blok With
+
+# LOCALIZATION NOTE (closureScope): The label that is displayed in the variables
+# pane as a header on container for identifiers in a closure scope.
+closureScope=Zaprtje
+
+# LOCALIZATION NOTE (emptyText): The text that is displayed in the stack frames
+# list when there are no frames to display.
+emptyText=Prazno
+
+# LOCALIZATION NOTE (loadingText): The text that is displayed in the script
+# editor when the laoding process has started but there is no file to display
+# yet.
+loadingText=Nalaganje\u2026
+
+# LOCALIZATION NOTE (loadingError):
+# This is the error message that is displayed on failed attempts to load an
+# external resource file.
+# %1$S=URL, %2$S=status code
+loadingError=Napaka pri nalaganju %1$S: %2$S
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/devtools/gcli.properties
@@ -0,0 +1,143 @@
+# LOCALIZATION NOTE These strings are used inside the Web Console
+# command line which is available from the Web Developer sub-menu
+# -> 'Web Console'.
+# The correct localization of this file might be to keep it in
+# English, or another language commonly spoken among web developers.
+# You want to make that choice consistent across the developer tools.
+# A good criteria is the language in which you'd find the best
+# documentation on web development on the web.
+
+# LOCALIZATION NOTE (canonDescNone): Short string used to describe any command
+# or command parameter when no description has been provided.
+canonDescNone=(Brez opisa)
+
+# LOCALIZATION NOTE (cliEvalJavascript): The special '{' command allows entry
+# of JavaScript like traditional developer tool command lines. This describes
+# the '{' command.
+cliEvalJavascript=Neposreden vnos JavaScripta
+
+# LOCALIZATION NOTE (fieldSelectionSelect): When a command has a parameter
+# that has a number of pre-defined options the user interface presents these
+# in a drop-down menu, where the first 'option' is an indicator that a
+# selection should be made. This string describes that first option.
+fieldSelectionSelect=Izberite %S ...
+
+# LOCALIZATION NOTE (fieldArrayAdd): When a command has a parameter that can
+# be repeated a number of times (e.g. like the 'cat a.txt b.txt' command) the
+# user interface presents buttons to add and remove arguments. This string is
+# used to add arguments.
+fieldArrayAdd=Dodaj
+
+# LOCALIZATION NOTE (fieldArrayDel): When a command has a parameter that can
+# be repeated a number of times (e.g. like the 'cat a.txt b.txt' command) the
+# user interface presents buttons to add and remove arguments. This string is
+# used to remove arguments.
+fieldArrayDel=Zbriši
+
+# LOCALIZATION NOTE (jstypeParseScope): The command line provides completion
+# for JavaScript commands, however there are times when the scope of what
+# we're completing against can't be used. This error message is displayed when
+# this happens.
+jstypeParseScope=Obseg izgubljen
+
+# LOCALIZATION NOTE (jstypeParseMissing): When the command line is doing
+# JavaScript completion, sometimes the property to be completed does not
+# exist. This error message is displayed when this happens.
+jstypeParseMissing=Ni mogoče najti lastnosti '%S'
+
+# LOCALIZATION NOTE (jstypeBeginSyntax): When the command line is doing
+# JavaScript completion using invalid JavaScript, this error message is
+# displayed.
+jstypeBeginSyntax=Skladenjska napaka
+
+# LOCALIZATION NOTE (jstypeBeginUnterm): When the command line is doing
+# JavaScript completion using a string that is not properly terminated, this
+# error message is displayed.
+jstypeBeginUnterm=Nedokončan niz
+
+# LOCALIZATION NOTE (jstypeParseError): If the system for providing JavaScript
+# completions encounters and error it displays this.
+jstypeParseError=Napaka
+
+# LOCALIZATION NOTE (typesNumberNan): When the command line is passed a
+# number, however the input string is not a valid number, this error message
+# is displayed.
+typesNumberNan=Ni mogoče pretvoriti "%S" v število.
+
+# LOCALIZATION NOTE (typesNumberMax): When the command line is passed a
+# number, but the number is bigger than the largest allowed number, this error
+# message is displayed.
+typesNumberMax=%1$S je večji od zgornje meje: %2$S.
+
+# LOCALIZATION NOTE (typesNumberMin): When the command line is passed a
+# number, but the number is lower than the smallest allowed number, this error
+# message is displayed.
+typesNumberMin=%1$S je manjši od spodnje meje: %2$S.
+
+# LOCALIZATION NOTE (typesSelectionNomatch): When the command line is passed
+# an option with a limited number of correct values, but the passed value is
+# not one of them, this error message is displayed.
+typesSelectionNomatch=Ni mogoče uporabiti '%S'.
+
+# LOCALIZATION NOTE (nodeParseSyntax): When the command line is expecting a
+# CSS query string, however the passed string is not valid, this error message
+# is displayed.
+nodeParseSyntax=Skladenjska napaka v poizvedbi CSS
+
+# LOCALIZATION NOTE (nodeParseMultiple): When the command line is expecting a
+# CSS string that matches a single node, but more than one node matches, this
+# error message is displayed.
+nodeParseMultiple=Preveč zadetkov (%S)
+
+# LOCALIZATION NOTE (nodeParseNone): When the command line is expecting a CSS
+# string that matches a single node, but no nodes match, this error message is
+# displayed.
+nodeParseNone=Ni zadetkov
+
+# LOCALIZATION NOTE (helpDesc): A very short description of the 'help'
+# command. This string is designed to be shown in a menu alongside the command
+# name, which is why it should be as short as possible. See helpManual for a
+# fuller description of what it does.
+helpDesc=Pomoč o ukazih
+
+# LOCALIZATION NOTE (helpManual): A fuller description of the 'help' command.
+# Displayed when the user asks for help on what it does.
+helpManual=Pomoč o posameznih ukazih (če je podan iskalni niz in je najden točen zadetek) ali o vseh ukazih, ki so na voljo (če iskalni niz ni podan ali ni točnega zadetka).
+
+# LOCALIZATION NOTE (helpSearchDesc): A very short description of the 'search'
+# parameter to the 'help' command. See helpSearchManual for a fuller
+# description of what it does. This string is designed to be shown in a dialog
+# with restricted space, which is why it should be as short as possible.
+helpSearchDesc=Iskalni niz
+
+# LOCALIZATION NOTE (helpSearchManual): A fuller description of the 'search'
+# parameter to the 'help' command. Displayed when the user asks for help on
+# what it does.
+helpSearchManual=Iskalni niz za omejitev seznama ukazov, ki so na voljo uporabniku. Vsak del niza šteje, regularni izrazi pa niso podprti.
+
+# LOCALIZATION NOTE (helpManSynopsis): A heading shown at the top of a help
+# page for a command in the console It labels a summary of the parameters to
+# the command
+helpManSynopsis=Povzetek
+
+# LOCALIZATION NOTE (helpManDescription): A heading shown in a help page for a
+# command in the console. This heading precedes the top level description.
+helpManDescription=Opis
+
+# LOCALIZATION NOTE (helpManParameters): A heading shown above the parameters
+# in a help page for a command in the console.
+helpManParameters=Parameteri
+
+# LOCALIZATION NOTE (helpManNone): Some text shown under the parameters
+# heading in a help page for a command which has no parameters.
+helpManNone=Brez
+
+# LOCALIZATION NOTE (introHeader): The heading displayed at the top of the
+# output for the help command
+introHeader=Pozdravljeni v razvojnih orodjih za Firefox
+
+# LOCALIZATION NOTE (introBody): The text displayed at the top of the output
+# for the help command, just before the list of commands. This text is wrapped
+# inside a link to a localized MDN article
+introBody=Za več informacij si oglejte MDN.
+
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/devtools/gclicommands.properties
@@ -0,0 +1,285 @@
+# LOCALIZATION NOTE These strings are used inside Web Console commands.
+# The Web Console command line is available from the Web Developer sub-menu
+# -> 'Web Console'.
+#
+# The correct localization of this file might be to keep it in
+# English, or another language commonly spoken among web developers.
+# You want to make that choice consistent across the developer tools.
+# A good criteria is the language in which you'd find the best
+# documentation on web development on the web.
+
+# LOCALIZATION NOTE (echoDesc) A very short string used to describe the
+# function of the echo command.
+echoDesc=Prikaži sporočilo
+
+# LOCALIZATION NOTE (echoMessageDesc) A very short string used to describe the
+# message parameter to the echo command.
+echoMessageDesc=Sporočilo
+
+# LOCALIZATION NOTE (helpDesc) A very short string used to describe the
+# function of the help command.
+helpDesc=Pomoč za uporabo ukazov, ki so na voljo
+
+# LOCALIZATION NOTE (helpAvailable) Used in the output of the help command to
+# explain the contents of the command help table.
+helpAvailable=Ukazi na voljo
+
+# LOCALIZATION NOTE (consoleDesc) A very short string used to describe the
+# function of the console command.
+consoleDesc=Ukazi za delo s konzolo
+
+# LOCALIZATION NOTE (consoleManual) A longer description describing the
+# set of commands that control the console.
+consoleManual=Filtrirajte, počistite in zaprite spletno konzolo
+
+# LOCALIZATION NOTE (consoleclearDesc) A very short string used to describe the
+# function of the 'console clear' command.
+consoleclearDesc=Počisti konzolo
+
+# LOCALIZATION NOTE (inspectDesc) A very short description of the 'inspect'
+# command. See inspectManual for a fuller description of what it does. This
+# string is designed to be shown in a menu alongside the command name, which
+# is why it should be as short as possible.
+inspectDesc=Preglej vozlišče
+
+# LOCALIZATION NOTE (inspectManual) A fuller description of the 'inspect'
+# command, displayed when the user asks for help on what it does.
+inspectManual=Preglejte mere in lastnosti elementa z uporabo izbirnika CSS in pregledovalnika DOM
+
+# LOCALIZATION NOTE (inspectNodeDesc) A very short string to describe the
+# 'node' parameter to the 'inspect' command, which is displayed in a dialog
+# when the user is using this command.
+inspectNodeDesc=Izbirnik CSS
+
+# LOCALIZATION NOTE (inspectNodeManual) A fuller description of the 'node'
+# parameter to the 'inspect' command, displayed when the user asks for help
+# on what it does.
+inspectNodeManual=Izbirnik CSS za uporabo z Document.querySelector, ki predstavlja posamezen element
+
+# LOCALIZATION NOTE (tiltDesc) A very short description of the 'tilt'
+# command. See tiltManual for a fuller description of what it does. This
+# string is designed to be shown in a menu alongside the command name, which
+# is why it should be as short as possible.
+tiltDesc=Prikaži stran v 3D
+
+# LOCALIZATION NOTE (tiltManual) A fuller description of the 'tilt'
+# command, displayed when the user asks for help on what it does.
+tiltManual=Odkrijte razmerja med različnimi deli spletne strani in njihovimi predniki v treh razsežnostih
+
+# LOCALIZATION NOTE (tiltOpenDesc) A very short description of the 'tilt inspect'
+# command. See tiltOpenManual for a fuller description of what it does. This
+# string is designed to be shown in a menu alongside the command name, which
+# is why it should be as short as possible.
+tiltOpenDesc=Odpri pregledovalnik 3D
+
+# LOCALIZATION NOTE (tiltOpenManual) A fuller description of the 'tilt translate'
+# command, displayed when the user asks for help on what it does.
+tiltOpenManual=Zaženite pregledovalnik strani v treh razsežnostih in označite vozlišča z uporabo izbirnika CSS
+
+# LOCALIZATION NOTE (tiltTranslateDesc) A very short description of the 'tilt translate'
+# command. See tiltTranslateManual for a fuller description of what it does. This
+# string is designed to be shown in a menu alongside the command name, which
+# is why it should be as short as possible.
+tiltTranslateDesc=Premakni ogrodje strani
+
+# LOCALIZATION NOTE (tiltTranslateManual) A fuller description of the 'tilt translate'
+# command, displayed when the user asks for help on what it does.
+tiltTranslateManual=Postopno premaknite ogrodje strani v določeno smer
+
+# LOCALIZATION NOTE (tiltTranslateXDesc) A very short string to describe the
+# 'x' parameter to the 'tilt translate' command, which is displayed in a dialog
+# when the user is using this command.
+tiltTranslateXDesc=X (pike)
+
+# LOCALIZATION NOTE (tiltTranslateXManual) A fuller description of the 'x'
+# parameter to the 'translate' command, displayed when the user asks for help
+# on what it does.
+tiltTranslateXManual=Število pik za premik ogrodja strani vzdolž osi X
+
+# LOCALIZATION NOTE (tiltTranslateYDesc) A very short string to describe the
+# 'y' parameter to the 'tilt translate' command, which is displayed in a dialog
+# when the user is using this command.
+tiltTranslateYDesc=Y (pike)
+
+# LOCALIZATION NOTE (tiltTranslateYManual) A fuller description of the 'y'
+# parameter to the 'translate' command, displayed when the user asks for help
+# on what it does.
+tiltTranslateYManual=Število pik za premik ogrodja strani vzdolž osi Y
+
+# LOCALIZATION NOTE (tiltRotateDesc) A very short description of the 'tilt rotate'
+# command. See tiltRotateManual for a fuller description of what it does. This
+# string is designed to be shown in a menu alongside the command name, which
+# is why it should be as short as possible.
+tiltRotateDesc=Zavrti ogrodje strani
+
+# LOCALIZATION NOTE (tiltRotateManual) A fuller description of the 'tilt rotate'
+# command, displayed when the user asks for help on what it does.
+tiltRotateManual=Postopno zavrtite ogrodje strani v določeno smer
+
+# LOCALIZATION NOTE (tiltRotateXDesc) A very short string to describe the
+# 'x' parameter to the 'tilt rotate' command, which is displayed in a dialog
+# when the user is using this command.
+tiltRotateXDesc=X (stopinje)
+
+# LOCALIZATION NOTE (tiltRotateXManual) A fuller description of the 'x'
+# parameter to the 'rotate' command, displayed when the user asks for help
+# on what it does.
+tiltRotateXManual=Število stopinj za vrtenje ogrodja strani okrog osi X
+
+# LOCALIZATION NOTE (tiltRotateYDesc) A very short string to describe the
+# 'y' parameter to the 'tilt rotate' command, which is displayed in a dialog
+# when the user is using this command.
+tiltRotateYDesc=Y (stopinje)
+
+# LOCALIZATION NOTE (tiltRotateYManual) A fuller description of the 'y'
+# parameter to the 'rotate' command, displayed when the user asks for help
+# on what it does.
+tiltRotateYManual=Število stopinj za vrtenje ogrodja strani okrog osi Y
+
+# LOCALIZATION NOTE (tiltRotateZDesc) A very short string to describe the
+# 'z' parameter to the 'tilt rotate' command, which is displayed in a dialog
+# when the user is using this command.
+tiltRotateZDesc=Z (stopinje)
+
+# LOCALIZATION NOTE (tiltRotateZManual) A fuller description of the 'z'
+# parameter to the 'rotate' command, displayed when the user asks for help
+# on what it does.
+tiltRotateZManual=Število stopinj za vrtenje ogrodja strani okrog osi Z
+
+# LOCALIZATION NOTE (tiltZoomDesc) A very short description of the 'tilt zoom'
+# command. See tiltZoomManual for a fuller description of what it does. This
+# string is designed to be shown in a menu alongside the command name, which
+# is why it should be as short as possible.
+tiltZoomDesc=Približaj ali odmakni ogrodje strani
+
+# LOCALIZATION NOTE (tiltZoomManual) A fuller description of the 'tilt zoom'
+# command, displayed when the user asks for help on what it does.
+tiltZoomManual=Postopno premaknite ogrodje strani v določeni smeri vzdolž osi Z
+
+# LOCALIZATION NOTE (tiltZoomAmountDesc) A very short string to describe the
+# 'zoom' parameter to the 'tilt zoom' command, which is displayed in a dialog
+# when the user is using this command.
+tiltZoomAmountDesc=Povečava (pike)
+
+# LOCALIZATION NOTE (tiltZoomAmmuntManual) A fuller description of the 'zoom'
+# parameter to the 'zoom' command, displayed when the user asks for help
+# on what it does.
+tiltZoomAmountManual=Število pik za premik ogrodja strani vzdolž osi Z
+
+# LOCALIZATION NOTE (tiltResetDesc) A very short description of the 'tilt reset'
+# command. See tiltResetManual for a fuller description of what it does. This
+# string is designed to be shown in a menu alongside the command name, which
+# is why it should be as short as possible.
+tiltResetDesc=Ponastavi premik, vrtenje in povečavo
+
+# LOCALIZATION NOTE (tiltResetManual) A fuller description of the 'tilt reset'
+# command, displayed when the user asks for help on what it does.
+tiltResetManual=Ponastavite vse spremembe, ki ste jih izvedli nad ogrodjem strani
+
+# LOCALIZATION NOTE (tiltCloseDesc) A very short description of the 'tilt close'
+# command. See tiltCloseManual for a fuller description of what it does. This
+# string is designed to be shown in a menu alongside the command name, which
+# is why it should be as short as possible.
+tiltCloseDesc=Zapri pregledovalnik 3D, če je odprt
+
+# LOCALIZATION NOTE (tiltCloseManual) A fuller description of the 'tilt close'
+# command, displayed when the user asks for help on what it does.
+tiltCloseManual=Zaprite pregledovalnik strani v treh razsežnostih in preklopite nazaj na privzet pregledovalnik
+
+# LOCALIZATION NOTE (breakDesc) A very short string used to describe the
+# function of the break command.
+breakDesc=Prekinitvene točke
+
+# LOCALIZATION NOTE (breakManual) A longer description describing the
+# set of commands that control breakpoints.
+breakManual=Ukazi za prikazovanje, dodajanje in odstranjevanje prekinitvenih točk
+
+# LOCALIZATION NOTE (breaklistDesc) A very short string used to describe the
+# function of the 'break list' command.
+breaklistDesc=Prikaži znane prekinitvene točke
+
+# LOCALIZATION NOTE (breaklistLineEntry) Used in the output of the 'break list'
+# command to display a single line breakpoint.
+# %1$S=script URL, %2$S=line number
+breaklistLineEntry=Enovrstična prekinitvena točka v %1$S:%2$S
+
+# LOCALIZATION NOTE (breaklistNone) Used in the output of the 'break list'
+# command to explain that the list is empty.
+breaklistNone=Ni prekinitvenih točk
+
+# LOCALIZATION NOTE (breaklistIntro) Used in the output of the 'break list'
+# command to preface the list contents.
+breaklistIntro=Nastavljene so naslednje prekinitvene točke:
+
+# LOCALIZATION NOTE (breakaddAdded) Used in the output of the 'break add'
+# command to explain that a breakpoint was added.
+breakaddAdded=Prekinitvena točka dodana
+
+# LOCALIZATION NOTE (breakaddFailed) Used in the output of the 'break add'
+# command to explain that a breakpoint could not be added.
+breakaddFailed=Ni bilo mogoče nastaviti prekinitvene točke: %S
+
+# LOCALIZATION NOTE (breakaddDesc) A very short string used to describe the
+# function of the 'break add' command.
+breakaddDesc=Dodaj prekinitveno točko
+
+# LOCALIZATION NOTE (breakaddManual) A longer description describing the
+# set of commands that are responsible for adding breakpoints.
+breakaddManual=Podprte vrste prekinitvenih točk: line
+
+# LOCALIZATION NOTE (breakaddDebuggerStopped) Used in the output of the
+# 'break add' command to explain that the debugger must be opened first.
+breakaddDebuggerStopped=Za dodajanje prekinitvenih točk morate odpreti iskalnik napak
+
+# LOCALIZATION NOTE (breakaddlineDesc) A very short string used to describe the
+# function of the 'break add line' command.
+breakaddlineDesc=Dodaj enovrstično prekinitveno točko
+
+# LOCALIZATION NOTE (breakaddlineFileDesc) A very short string used to describe
+# the function of the file parameter in the 'break add line' command.
+breakaddlineFileDesc=URI datoteke JS
+
+# LOCALIZATION NOTE (breakaddlineLineDesc) A very short string used to describe
+# the function of the line parameter in the 'break add line' command.
+breakaddlineLineDesc=Številka vrstice
+
+# LOCALIZATION NOTE (breakdelDesc) A very short string used to describe the
+# function of the 'break del' command.
+breakdelDesc=Odstrani prekinitveno točko
+
+# LOCALIZATION NOTE (breakdelBreakidDesc) A very short string used to describe
+# the function of the index parameter in the 'break del' command.
+breakdelBreakidDesc=Indeks prekinitvene točke
+
+# LOCALIZATION NOTE (breakdelRemoved) Used in the output of the 'break del'
+# command to explain that a breakpoint was removed.
+breakdelRemoved=Prekinitvena točka odstranjena
+
+# LOCALIZATION NOTE (breakNotFound) Used in the output of the 'break del'
+# command to explain that the breakpoint was not found.
+breakNotFound=Prekinitvena točka ni bila najdena
+
+# LOCALIZATION NOTE (consolecloseDesc) A very short description of the
+# 'console close' command. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+consolecloseDesc=Zapri konzolo
+
+# LOCALIZATION NOTE (editDesc) A very short description of the 'edit'
+# command. See editManual for a fuller description of what it does. This
+# string is designed to be shown in a menu alongside the command name, which
+# is why it should be as short as possible.
+editDesc=Popravi vir strani
+
+# LOCALIZATION NOTE (editManual) A fuller description of the 'edit' command,
+# displayed when the user asks for help on what it does.
+editManual=Uredite enega izmed virov, ki sestavljajo stran (ali kak splošen spletni vir?)
+
+# LOCALIZATION NOTE (editResourceDesc) A very short string to describe the
+# 'resource' parameter to the 'edit' command, which is displayed in a dialog
+# when the user is using this command.
+editResourceDesc=URL za urejanje
+
+# LOCALIZATION NOTE (editLineToJumpToDesc) A very short string to describe the
+# 'line' parameter to the 'edit' command, which is displayed in a dialog
+# when the user is using this command.
+editLineToJumpToDesc=Skoči na vrstico
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/devtools/inspector.properties
@@ -0,0 +1,34 @@
+# LOCALIZATION NOTE These strings are used inside the Inspector
+# which is available from the Web Developer sub-menu -> 'Inspect'.
+#
+# The correct localization of this file might be to keep it in
+# English, or another language commonly spoken among web developers.
+# You want to make that choice consistent across the developer tools.
+# A good criteria is the language in which you'd find the best
+# documentation on web development on the web.
+
+# LOCALIZATION NOTE (confirmNavigationAway): Used in the Inspector tool, when
+# the user tries to navigate away from a web page, to confirm the change of
+# page.
+confirmNavigationAway.message=Če zapustite to stran, boste zaprli Pregledovalnik in izgubili vse spremembe.
+confirmNavigationAway.buttonLeave=Zapusti stran
+confirmNavigationAway.buttonLeaveAccesskey=Z
+confirmNavigationAway.buttonStay=Ostani na strani
+confirmNavigationAway.buttonStayAccesskey=S
+
+breadcrumbs.siblings=Bratje
+# LOCALIZATION NOTE (htmlPanel): Used in the Inspector tool's openInspectorUI
+# method when registering the HTML panel.
+
+# LOCALIZATION NOTE (ruleView.*): Button label, accesskey and tooltip text
+# associated with the Highlighter's CSS Rule View in the Style Sidebar.
+ruleView.label=Pravila
+ruleView.accesskey=R
+ruleView.tooltiptext=Ogled in urejanje CSS
+
+# LOCALIZATION NOTE (inspectButton.tooltiptext):
+# This button appears in the Inspector Toolbar. inspectButton is stateful,
+# if it's pressed users can select an element with the mouse. Pressing the
+# "Return" key # changes that state. %S is the keyboard shortcut (VK_RETURN in
+# chrome://global/locale/keys.properties).
+inspectButton.tooltiptext=Izberi element z miško (%S)
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/devtools/scratchpad.dtd
@@ -0,0 +1,111 @@
+<!-- LOCALIZATION NOTE : FILE This file contains the Scratchpad window strings -->
+<!-- LOCALIZATION NOTE : FILE Do not translate commandkeys -->
+
+<!-- LOCALIZATION NOTE : FILE The correct localization of this file might be to
+  - keep it in English, or another language commonly spoken among web developers.
+  - You want to make that choice consistent across the developer tools.
+  - A good criteria is the language in which you'd find the best
+  - documentation on web development on the web. -->
+
+<!-- LOCALIZATION NOTE (scratchpad.title):
+  -  The Scratchpad is intended to provide a simple text editor for creating
+  -  and evaluating bits of JavaScript code for the purposes of function
+  -  prototyping, experimentation and convenient scripting.
+  -
+  -  It's quite possible that you won't have a good analogue for the word
+  -  "Scratchpad" in your locale. You should feel free to find a close
+  -  approximation to it or choose a word (or words) that means
+  -  "simple discardable text editor". -->
+<!ENTITY window.title                 "Beležnica">
+
+<!ENTITY fileMenu.label               "Datoteka">
+<!ENTITY fileMenu.accesskey           "D">
+
+<!ENTITY newWindowCmd.label           "Novo okno">
+<!ENTITY newWindowCmd.accesskey       "N">
+<!ENTITY newWindowCmd.commandkey      "n">
+
+<!ENTITY openFileCmd.label            "Odpri datoteko …">
+<!ENTITY openFileCmd.accesskey        "O">
+<!ENTITY openFileCmd.commandkey       "o">
+
+<!ENTITY saveFileCmd.label            "Shrani">
+<!ENTITY saveFileCmd.accesskey        "S">
+<!ENTITY saveFileCmd.commandkey       "s">
+
+<!ENTITY saveFileAsCmd.label          "Shrani kot …">
+<!ENTITY saveFileAsCmd.accesskey      "k">
+
+<!ENTITY closeCmd.label               "Zapri">
+<!ENTITY closeCmd.key                 "W">
+<!ENTITY closeCmd.accesskey           "Z">
+
+<!ENTITY editMenu.label               "Urejanje">
+<!ENTITY editMenu.accesskey           "E">
+
+<!ENTITY run.label                    "Poženi">
+<!ENTITY run.accesskey                "R">
+<!ENTITY run.key                      "P">
+
+<!ENTITY inspect.label                "Preglej">
+<!ENTITY inspect.accesskey            "I">
+<!ENTITY inspect.key                  "r">
+
+<!ENTITY display.label                "Prikaži">
+<!ENTITY display.accesskey            "D">
+<!ENTITY display.key                  "i">
+
+<!-- LOCALIZATION NOTE (environmentMenu.label, accesskey): This menu item was
+  -  renamed from "Context" to avoid confusion with the right-click context
+  -  menu in the text area. It refers to the JavaScript Environment (or context)
+  -  the user is evaluating against. I.e., Content (current tab) or Chrome
+  -  (browser).
+  -->
+<!ENTITY environmentMenu.label        "Okolje">
+<!ENTITY environmentMenu.accesskey    "O">
+
+
+<!ENTITY contentContext.label         "Vsebina strani">
+<!ENTITY contentContext.accesskey     "V">
+
+<!-- LOCALIZATION NOTE (browserContext.label, accesskey): This menu item is used
+  -  to select an execution environment for the browser window itself as opposed
+  -  to content. This is a feature for browser and addon developers and only
+  -  enabled via the devtools.chrome.enabled preference. Formerly, this label
+  -  was called "Chrome".
+  -->
+<!ENTITY browserContext.label         "Brskalnik">
+<!ENTITY browserContext.accesskey     "B">
+
+<!-- LOCALIZATION NOTE some localizations of Windows (ex:french, german) use "?"
+  -  for the help button in the menubar but Gnome does not.
+  -->
+<!ENTITY helpMenu.label               "Pomoč">
+<!ENTITY helpMenu.accesskey           "M">
+<!ENTITY helpMenuWin.label            "Pomoč">
+<!ENTITY helpMenuWin.accesskey        "M">
+
+<!ENTITY documentationLink.label      "Pomoč za beležnico na MDN">
+<!ENTITY documentationLink.accesskey  "D">
+
+
+<!-- LOCALIZATION NOTE (resetContext2.label): This command allows the developer
+  -  to reset/clear the global object of the environment where the code executes.
+  -->
+<!ENTITY resetContext2.label           "Ponastavi spremenljivke">
+<!ENTITY resetContext2.accesskey       "P">
+
+<!ENTITY executeMenu.label            "Izvedi">
+<!ENTITY executeMenu.accesskey        "I">
+
+<!-- LOCALIZATION NOTE (errorConsoleCmd.commandkey): This command key launches
+  -  the browser Error Console, the key should be identical to the property of
+  -  the same name in browser.dtd.
+  -->
+<!ENTITY errorConsoleCmd.commandkey   "j">
+
+<!-- LOCALIZATION NOTE (webConsoleCmd.commandkey): This command key launches
+  -  the browser WebConsole, the key should be identical to the property of
+  -  the same name in browser.dtd.
+  -->
+<!ENTITY webConsoleCmd.commandkey     "k">
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/devtools/scratchpad.properties
@@ -0,0 +1,60 @@
+# LOCALIZATION NOTE These strings are used inside the JavaScript scratchpad
+# which is available from the Web Developer sub-menu -> 'Scratchpad'.
+#
+# The correct localization of this file might be to keep it in
+# English, or another language commonly spoken among web developers.
+# You want to make that choice consistent across the developer tools.
+# A good criteria is the language in which you'd find the best
+# documentation on web development on the web.
+
+# LOCALIZATION NOTE  (propertyPanel.updateButton.label): Used in the Property
+# Panel that is opened by the Scratchpad window when inspecting an object. This
+# is the Update button label.
+propertyPanel.updateButton.label=Posodobi
+propertyPanel.updateButton.accesskey=P
+
+# LOCALIZATION NOTE  (export.fileOverwriteConfirmation): This is displayed when
+# the user attempts to save to an already existing file.
+export.fileOverwriteConfirmation=Datoteka obstaja. Jo prepišem?
+
+# LOCALIZATION NOTE  (browserWindow.unavailable): This error message is shown
+# when Scratchpad does not find any recently active window of navigator:browser
+# type.
+browserWindow.unavailable=Beležnica ne najde okna brskalnika, v katerem bi lahko izvedla kodo.
+
+# LOCALIZATION NOTE  (openFile.title): This is the file picker title, when you
+# open a file from Scratchpad.
+openFile.title=Odpri datoteko
+
+# LOCALIZATION NOTE  (openFile.failed): This is the message displayed when file
+# open fails.
+openFile.failed=Branje datoteke ni uspelo.
+
+# LOCALIZATION NOTE  (saveFileAs): This is the file picker title, when you save
+# a file in Scratchpad.
+saveFileAs=Shrani datoteko kot
+
+# LOCALIZATION NOTE  (saveFile.failed): This is the message displayed when file
+# save fails.
+saveFile.failed=Shranjevanje datoteke ni uspelo.
+
+# LOCALIZATION NOTE  (confirmClose): This is message in the prompt dialog when
+# you try to close a scratchpad with unsaved changes.
+confirmClose=Ali želite shraniti spremembe v tej beležnici?
+
+# LOCALIZATION NOTE  (confirmClose.title): This is title of the prompt dialog when
+# you try to close a scratchpad with unsaved changes.
+confirmClose.title=Neshranjene spremembe
+
+# LOCALIZATION NOTE  (scratchpadIntro): This is a multi-line comment explaining
+# how to use the Scratchpad. Note that this should be a valid JavaScript
+# comment inside /* and */.
+scratchpadIntro=/*\n * Pred vami je beležnica za pisanje kode v JavaScriptu.\n *\n * Vnesite nekaj kode v JavaScriptu, nato pa desno kliknite ali v meniju Izvedi izberite:\n * 1. Poženi za izvajanje označenega besedila.\n * 2. Preglej za prikaz rezultata v pregledovalniku objektov.\n * 3. Prikaži za izpis rezultata v komentarju pod označenim besedilom.\n */\n\n
+
+# LOCALIZATION NOTE  (notification.browserContext): This is the message displayed
+# over the top of the editor when the user has switched to browser context.
+browserContext.notification=Ta beležnica se izvaja v okolju brskalnika.
+
+# LOCALIZATION NOTE (help.openDocumentationPage): This returns a localized link with
+# documentation for Scratchpad on MDN.
+help.openDocumentationPage=https://developer.mozilla.org/en/Tools/Scratchpad
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/devtools/sourceeditor.dtd
@@ -0,0 +1,15 @@
+<!-- LOCALIZATION NOTE : FILE This file contains the Source Editor component
+  - strings. The source editor component is used within the Scratchpad and
+  - Style Editor tools. -->
+
+<!-- LOCALIZATION NOTE : FILE Do not translate commandkeys -->
+
+<!-- LOCALIZATION NOTE : FILE The correct localization of this file might be to
+  - keep it in English, or another language commonly spoken among web developers.
+  - You want to make that choice consistent across the developer tools.
+  - A good criteria is the language in which you'd find the best
+  - documentation on web development on the web. -->
+
+<!ENTITY gotoLineCmd.label         "Skoči na vrstico …">
+<!ENTITY gotoLineCmd.key           "J">
+<!ENTITY gotoLineCmd.accesskey     "S">
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/devtools/sourceeditor.properties
@@ -0,0 +1,40 @@
+# LOCALIZATION NOTE These strings are used inside the Source Editor component.
+# This component is used whenever source code is displayed for the purpose of
+# being edited, inside the Firefox developer tools - current examples are the
+# Scratchpad and the Style Editor tools.
+
+# LOCALIZATION NOTE The correct localization of this file might be to keep it
+# in English, or another language commonly spoken among web developers.
+# You want to make that choice consistent across the developer tools.
+# A good criteria is the language in which you'd find the best documentation
+# on web development on the web.
+
+# LOCALIZATION NOTE  (findCmd.promptTitle): This is the dialog title used
+# when the user wants to search for a string in the code. You can
+# access this feature by pressing Ctrl-F on Windows/Linux or Cmd-F on Mac.
+findCmd.promptTitle=Iskanje
+
+# LOCALIZATION NOTE  (gotoLineCmd.promptMessage): This is the message shown when
+# the user wants to search for a string in the code. You can
+# access this feature by pressing Ctrl-F on Windows/Linux or Cmd-F on Mac.
+findCmd.promptMessage=Najdi:
+
+# LOCALIZATION NOTE  (gotoLineCmd.promptTitle): This is the dialog title used
+# when the user wants to jump to a specific line number in the code. You can
+# access this feature by pressing Ctrl-J on Windows/Linux or Cmd-J on Mac.
+gotoLineCmd.promptTitle=Skoči na vrstico
+
+# LOCALIZATION NOTE  (gotoLineCmd.promptMessage): This is the message shown when
+# the user wants to jump to a specific line number in the code. You can
+# access this feature by pressing Ctrl-J on Windows/Linux or Cmd-J on Mac.
+gotoLineCmd.promptMessage=Pojdi na vrstico številka:
+
+# LOCALIZATION NOTE  (annotation.breakpoint.title): This is the text shown in
+# front of any breakpoint annotation when it is displayed as a tooltip in one of
+# the editor gutters. This feature is used in the JavaScript Debugger.
+annotation.breakpoint.title=Prekinitvena točka: %S
+
+# LOCALIZATION NOTE  (annotation.currentLine): This is the text shown in
+# a tooltip displayed in any of the editor gutters when the user hovers the
+# current line.
+annotation.currentLine=Trenutna vrstica
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/devtools/styleeditor.dtd
@@ -0,0 +1,54 @@
+<!-- LOCALIZATION NOTE : FILE This file contains the Style Editor window strings -->
+<!-- LOCALIZATION NOTE : FILE Do not translate commandkeys -->
+<!-- LOCALIZATION NOTE : The correct localization of this file might be to keep
+     it in English, or another language commonly spoken among web developers.
+     You want to make that choice consistent across the developer tools.
+     A good criteria is the language in which you'd find the best documentation
+     on web development on the web. -->
+
+<!-- LOCALIZATION NOTE (window.title): This is the default title for Style Editor
+     main window. NB: the property chromeWindowTitle in styleeditor.properties
+     is used to dynamically update the Style Editor window title with the title
+     of the web page it is editing. -->
+<!ENTITY window.title               "Urejevalnik sloga">
+
+<!ENTITY newButton.label            "Novo">
+<!ENTITY newButton.tooltip          "Ustvari novo slogovno predlogo in jo dodaj v dokument">
+<!ENTITY newButton.accesskey        "N">
+<!ENTITY newButton.commandkey       "n">
+
+<!ENTITY importButton.label         "Uvozi…">
+<!ENTITY importButton.tooltip       "Uvozi obstoječo slogovno predlogo in jo dodaj v dokument">
+<!ENTITY importButton.accesskey     "I">
+<!ENTITY importButton.commandkey    "i">
+
+<!ENTITY visibilityToggle.tooltip   "Preklopi vidljivost slogovne predloge">
+<!ENTITY visibilityToggle.accesskey "V">
+
+<!ENTITY saveButton.label           "Shrani">
+<!ENTITY saveButton.tooltip         "Shrani slogovno predlogo v datoteko">
+<!ENTITY saveButton.accesskey       "S">
+<!ENTITY saveButton.commandkey      "s">
+
+<!-- LOCALICATION NOTE  (scoped.label): This is shown in a stylesheets list item
+     when the stylesheet uses the scoped attribute on the <style> element. -->
+<!ENTITY scoped.label               "V obsegu.">
+
+<!ENTITY editorTextbox.placeholder  "Vnesite CSS.">
+
+<!-- LOCALICATION NOTE  (noStyleSheet.label): This is shown when a page has no
+     stylesheet. -->
+<!ENTITY noStyleSheet.label         "Ta stran ne vsebuje slogovnih predlog.">
+
+<!-- LOCALICATION NOTE  (noStyleSheet-tip-start.label): This is the start of a
+     tip sentence shown when there is no stylesheet. It suggests to create a new
+     stylesheet and provides an action link to do so. -->
+<!ENTITY noStyleSheet-tip-start.label  "Ali želite ">
+<!-- LOCALICATION NOTE  (noStyleSheet-tip-action.label): This is text for the
+     link that triggers creation of a new stylesheet. -->
+<!ENTITY noStyleSheet-tip-action.label "dodati novo slogovno predlogo">
+<!-- LOCALICATION NOTE  (noStyleSheet-tip-end.label): End of the tip sentence -->
+<!ENTITY noStyleSheet-tip-end.label    "?">
+
+<!-- LOCALIZATION NOTE  (closeCmd.key): Accel + this key closes the window. -->
+<!ENTITY closeCmd.key                  "W">
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/devtools/styleeditor.properties
@@ -0,0 +1,64 @@
+# LOCALIZATION NOTE These strings are used inside the Style Editor.
+# LOCALIZATION NOTE The correct localization of this file might be to keep it
+# in English, or another language commonly spoken among web developers.
+# You want to make that choice consistent across the developer tools.
+# A good criteria is the language in which you'd find the best documentation
+# on web development on the web.
+
+# LOCALIZATION NOTE  (chromeWindowTitle): This is the title of the Style Editor
+# 'chrome' window. That is, the main window with the stylesheets list.
+# The argument is either the content document's title or its href if no title
+# is available.
+chromeWindowTitle=Urejevalnik sloga [%S]
+
+# LOCALIZATION NOTE  (inlineStyleSheet): This is the name used for an style sheet
+# that is declared inline in the <style> element. Shown in the stylesheets list.
+# the argument is the index (order) of the containing <style> element in the
+# document.
+inlineStyleSheet=<notranje slogovne predloge #%S>
+
+# LOCALIZATION NOTE  (newStyleSheet): This is the default name for a new
+# user-created style sheet.
+newStyleSheet=Nova slogovna predloga #%S
+
+# LOCALIZATION NOTE  (ruleCount.label): Semi-colon list of plural forms.
+# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
+# This is shown in the style sheets list.
+# #1 rule.
+# example: 111 rules.
+ruleCount.label=#1 pravilo.;Št. pravil: #1.
+
+# LOCALIZATION NOTE  (error-load.label): This is shown when loading fails.
+error-load=Slogovne predloge ni bilo mogoče naložiti.
+
+# LOCALIZATION NOTE  (error-save.label): This is shown when saving fails.
+error-save=Slogovne predloge ni bilo mogoče shraniti.
+
+# LOCALIZATION NOTE  (importStyleSheet.title): This is the file picker title,
+# when you import a style sheet into the Style Editor.
+importStyleSheet.title=Uvozi slogovno predlogo
+
+# LOCALIZATION NOTE  (importStyleSheet.title): This is the *.css filter title
+importStyleSheet.filter=Datoteke CSS
+
+# LOCALIZATION NOTE  (saveStyleSheet.title): This is the file picker title,
+# when you save a style sheet from the Style Editor.
+saveStyleSheet.title=Shrani slogovno predlogo
+
+# LOCALIZATION NOTE  (saveStyleSheet.title): This is the *.css filter title
+saveStyleSheet.filter=Datoteke CSS
+
+# LOCALIZATION NOTE  (saveStyleSheet.commandkey): This the key to use in
+# conjunction with accel (Command on Mac or Ctrl on other platforms) to Save
+saveStyleSheet.commandkey=S
+
+# LOCALIZATION NOTE  (undo.commandkey): This the key to use in
+# conjunction with accel (Command on Mac or Ctrl on other platforms) to Undo a
+# change in the editor.
+undo.commandkey=Z
+
+# LOCALIZATION NOTE  (redo.commandkey): This the key to use in
+# conjunction with accel+shift (accel is Command on Mac or Ctrl on other
+# platforms) to Redo a change in the editor.
+redo.commandkey=Z
+
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/devtools/styleinspector.dtd
@@ -0,0 +1,33 @@
+<!-- LOCALIZATION NOTE (userStylesLabel): This is the label for the checkbox
+  -  that specifies whether the styles that are not from the user's stylesheet
+  -  should be displayed or not. -->
+<!ENTITY userStylesLabel    "Samo uporabnikovi slogi">
+
+<!-- LOCALIZATION NOTE (userStylesSearch): This is the placeholder that goes in
+  -  the search box when no search term has been entered. -->
+<!ENTITY userStylesSearch      "Iskanje">
+
+<!-- LOCALIZATION NOTE (selectedElementLabel): This is the label for the path of
+  -  the highlighted element in the web page. This path is based on the document
+  -  tree. -->
+<!ENTITY selectedElementLabel  "Izbran element:">
+
+<!-- LOCALIZATION NOTE (noPropertiesFound): In the case where there are no CSS
+  -  properties to display e.g. due to search criteria this message is
+  -  displayed. -->
+<!ENTITY noPropertiesFound     "Lastnosti CSS ni bilo mogoče najti.">
+
+<!-- LOCALIZATION NOTE (unmatchedSelectors): For each style property
+  -  the panel shows whether there are any selectors that do not match the
+  -  currently selected element. -->
+<!ENTITY unmatchedSelectors    "Neujemajoči izbirniki">
+
+<!-- LOCALIZATION NOTE (bestMatch, matched, parentMatch & unmatched): For each
+  -  style property the panel shows the rules which hold that specific property.
+  -  For every rule, the rule status is also displayed: a rule can be the best
+  -  match, a match, a parent match, or a rule did not match the element the
+  -  user has highlighted. -->
+<!ENTITY bestMatch             "Najbolj ujemajoče">
+<!ENTITY matched               "Ujemajoče">
+<!ENTITY parentMatch           "Ujemajoče s predhodnikom">
+<!ENTITY unmatched             "Neujemajoče">
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/devtools/styleinspector.properties
@@ -0,0 +1,123 @@
+# LOCALIZATION NOTE These strings are used inside the Style Inspector.
+#
+# The correct localization of this file might be to keep it in
+# English, or another language commonly spoken among web developers.
+# You want to make that choice consistent across the developer tools.
+# A good criteria is the language in which you'd find the best
+# documentation on web development on the web.
+
+
+# LOCALIZATION NOTE (panelTitle): This is the panel title
+panelTitle=Slog
+
+# LOCALIZATION NOTE (rule.status): For each style property the panel shows
+# the rules which hold that specific property. For every rule, the rule status
+# is also displayed: a rule can be the best match, a match, a parent match, or a
+# rule did not match the element the user has highlighted.
+rule.status.BEST=Najbolj ujemajoče
+rule.status.MATCHED=Ujemajoče
+rule.status.PARENT_MATCH=Ujemajoče s predhodnikom
+rule.status.UNMATCHED=Neujemajoče
+
+# LOCALIZATION NOTE (rule.sourceElement, rule.sourceInline): For each
+# style property the panel shows the rules which hold that specific property.
+# For every rule, the rule source is also displayed: a rule can come from a
+# file, from the same page (inline), or from the element itself (element).
+rule.sourceInline=V vrstici
+rule.sourceElement=element
+
+# LOCALIZATION NOTE (rule.inheritedSource): Shown for CSS rules
+# that were inherited from a parent node.  Will be passed a node
+# identifier and a source location.
+# e.g "Inherited from body#bodyID (styles.css:20)"
+rule.inheritedSource=Podedovano od %S (%S)
+
+# LOCALIZATION NOTE (style.highlighter.button): These strings are used inside
+# sidebar of the Highlighter for the style inspector button.
+# "Computed" refers to the Computed Style of the element.
+style.highlighter.button.label2=Izračunano
+style.highlighter.accesskey2=I
+style.highlighter.button.tooltip2=Pregled izračunanih slogov elementa
+
+# LOCALIZATION NOTE (helpLinkTitle): For each style property
+# the user can hover it and get a help link button which allows one to
+# quickly jump to the documentation from the Mozilla Developer Network site.
+# This is the link title shown in the hover tooltip.
+helpLinkTitle=Preberite dokumentacijo o tej lastnosti
+
+# LOCALIZATION NOTE (rule.warning.title): When an invalid property value is
+# entered into the rule view a warning icon is displayed. This text is used for
+# the title attribute of the warning icon.
+rule.warning.title=Neveljavna vrednost lastnosti
+
+# LOCALIZATION NOTE (style.contextmenu.copyselection): The computed view's
+# context menu copy entry.
+style.contextmenu.copyselection=Kopiraj izbor
+
+# LOCALIZATION NOTE (style.contextmenu.copyselection.accesskey): The computed
+# view's context menu copy entry access key.
+style.contextmenu.copyselection.accesskey=K
+
+# LOCALIZATION NOTE (style.contextmenu.copydeclaration): The style inspector's
+# context menu copy property entry allows a complete CSS property to be copied.
+style.contextmenu.copydeclaration=Kopiraj vrstico
+
+# LOCALIZATION NOTE (style.contextmenu.copydeclaration.accesskey): The style
+# inspector's context menu copy property access key.
+style.contextmenu.copydeclaration.accesskey=V
+
+# LOCALIZATION NOTE (style.contextmenu.copyproperty): The style inspector's
+# context menu copy property name entry allows a CSS property name to be copied.
+style.contextmenu.copyproperty=Kopiraj lastnost
+
+# LOCALIZATION NOTE (style.contextmenu.copyproperty.accesskey): The style
+# inspector's context menu copy property name access key.
+style.contextmenu.copyproperty.accesskey=L
+
+# LOCALIZATION NOTE (style.contextmenu.copypropertyvalue): The style inspector's
+# context menu copy property value entry allows a CSS property name to be copied.
+style.contextmenu.copypropertyvalue=Kopiraj vrednost lastnosti
+
+# LOCALIZATION NOTE (style.contextmenu.copypropertyvalue.accesskey): The style
+# inspector's context menu copy property value access key.
+style.contextmenu.copypropertyvalue.accesskey=R
+
+# LOCALIZATION NOTE (rule.contextmenu.copyselection): The rule view's context
+# menu copy entry.
+rule.contextmenu.copyselection=Kopiraj izbor
+
+# LOCALIZATION NOTE (rule.contextmenu.copyselection.accesskey): The rule view's
+# context menu copy entry access key.
+rule.contextmenu.copyselection.accesskey=K
+
+# LOCALIZATION NOTE (rule.contextmenu.copyrule): The rule view's context menu
+# copy rule entry allows a complete CSS rule to be copied.
+rule.contextmenu.copyrule=Kopiraj pravilo
+
+# LOCALIZATION NOTE (rule.contextmenu.copyrule.accesskey): The rule view's
+# context menu copy rule access key.
+rule.contextmenu.copyrule.accesskey=P
+
+# LOCALIZATION NOTE (rule.contextmenu.copydeclaration): The rule view's context
+# menu copy property entry allows a complete CSS property to be copied.
+rule.contextmenu.copydeclaration=Kopiraj vrstico
+
+# LOCALIZATION NOTE (rule.contextmenu.copydeclaration.accesskey): The rule view's
+# context menu copy property access key.
+rule.contextmenu.copydeclaration.accesskey=V
+
+# LOCALIZATION NOTE (rule.contextmenu.copyproperty): The rule view's context
+# menu copy property entry allows a CSS property name to be copied.
+rule.contextmenu.copyproperty=Kopiraj lastnost
+
+# LOCALIZATION NOTE (rule.contextmenu.copyproperty.accesskey): The rule
+# view's context menu copy property name access key.
+rule.contextmenu.copyproperty.accesskey=L
+
+# LOCALIZATION NOTE (rule.contextmenu.copypropertyvalue): The rule view's
+# context menu copy property entry allows a CSS property value to be copied.
+rule.contextmenu.copypropertyvalue=Kopiraj vrednost lastnosti
+
+# LOCALIZATION NOTE (rule.contextmenu.copypropertyvalue.accesskey): The rule
+# view's context menu copy property value access key.
+rule.contextmenu.copypropertyvalue.accesskey=R
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/devtools/tilt.properties
@@ -0,0 +1,45 @@
+# LOCALIZATION NOTE These strings are used inside the Tilt Inspector
+# which is available from the Web Developer sub-menu -> 'Tilt'.
+#
+# The correct localization of this file might be to keep it in
+# English, or another language commonly spoken among web developers.
+# You want to make that choice consistent across the developer tools.
+# A good criteria is the language in which you'd find the best
+# documentation on web development on the web.
+
+# LOCALIZATION NOTE (initTilt.error): Tilt requires WebGL capabilities, which
+# are not available on every hardware. This message is displayed as an modal
+# popup window when initialization fails because of unsupported hardware.
+initTilt.error = Ni bilo mogoče zagnati Nagiba. Oglejte si\nnavodila za odpravljanje težav http://get.webgl.org/troubleshooting
+
+# LOCALIZATION NOTE (initWebGL.error): Tilt requires WebGL capabilities, which
+# are not available on every hardware. This message is displayed in the console
+# when initialization fails because of unsupported hardware.
+initWebGL.error = Ni bilo mogoče zagnati komponente WebGL. Morda je ne podpira vaša grafična kartica ali gonilnik.
+
+# LOCALIZATION NOTE (linkProgram.error): This error happens when the WebGL
+# context can't link two compiled shader programs together. It is displayed in
+# the Error Console.
+linkProgram.error = Ni bilo mogoče zagnati osenčevalnika: %S
+
+# LOCALIZATION NOTE (compileShader.source.error): This error is caused when the
+# source (uri or path) of a shader is not the expected one. It is displayed in
+# the Error Console.
+compileShader.source.error = Napačen vir osenčevalnika (pričakovan niz).
+
+# LOCALIATION NOTE (compileShader.type.error): There are two types of shader
+# programs - vertex and fragment. At a shader initialization, if none of these
+# two types is specified, this compile-time error is shown. It is displayed in
+# the Error Console.
+compileShader.type.error = Napačna vrsta osenčevalnika navedena za: %S
+
+# LOCALIZATION NOTE (compileShader.compile.error): If the shader source and
+# type are correctly specified, there may be syntax errors in the shader code.
+# If this is the case, this compile-time error is shown. It is displayed in
+# the Error Console.
+compileShader.compile.error = Stanje prevajanja osenčevalnika:\n%S
+
+# LOCALIZATION NOTE (compileShader.source.error): This error is caused when the
+# source (canvas or image) of a texture is not as expected. It is displayed in
+# the Error Console.
+initTexture.source.error = Napačen vir teksture (pričakovana slika).
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/devtools/webConsole.dtd
@@ -0,0 +1,16 @@
+<!ENTITY networkPanel.requestURL                  "URL zahtevka">
+<!ENTITY networkPanel.requestMethod               "Metoda zahtevka">
+<!ENTITY networkPanel.statusCode                  "Številka stanja">
+
+<!ENTITY networkPanel.requestHeaders              "Glava zahtevka">
+<!ENTITY networkPanel.requestCookie               "Poslani piškot">
+<!ENTITY networkPanel.requestBody                 "Telo zahtevka">
+<!ENTITY networkPanel.requestFormData             "Poslani podatki obrazca">
+
+<!ENTITY networkPanel.responseHeaders             "Glava odgovora">
+<!ENTITY networkPanel.responseBody                "Telo odgovora">
+<!ENTITY networkPanel.responseBodyCached          "Predpomnjeni podatki">
+<!ENTITY networkPanel.responseBodyUnknownType     "Neznana vrsta vsebine">
+<!ENTITY networkPanel.responseNoBody              "Ni telesa odgovora">
+<!ENTITY networkPanel.responseImage               "Prejeta slika">
+<!ENTITY networkPanel.responseImageCached         "Predpomnjena slika">
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/devtools/webconsole.properties
@@ -0,0 +1,189 @@
+# LOCALIZATION NOTE
+# The correct localization of this file might be to keep it in
+# English, or another language commonly spoken among web developers.
+# You want to make that choice consistent across the developer tools.
+# A good criteria is the language in which you'd find the best
+# documentation on web development on the web.
+
+typeError=Napaka: 
+typeWarning=Opozorilo: 
+typeNetwork=Mreža: 
+typeException=Izjema:  
+typeCssParser=Razčlenjevalnik CSS: 
+typeStrict=Strogo opozorilo: 
+msgCategory=Kategorija: 
+errLine=Vrstica: %S
+btnHide=Skrij
+btnPrefs=Nastavitve
+categoryPage=Stran:
+categoryConsole=Konzola:
+btnMutation=Preobrazba DOM
+tipMutation=Preklopi beleženje dogodkov preobrazb DOM
+btnPageNet=Mreža
+tipPageNet=Beleži omrežni dostop
+btnPageCSS=CSS
+tipPageCSS=Beleži napake račlenjevanja CSS
+btnPageJS=JS
+tipPageJS=Beleži izjeme JavaScripta
+# LOCALIZATION NOTE (btnPageLogging):
+#
+# This is used as the text of the "Logging" button on the toolbar. It
+# shows or hides messages that the web developer inserted on the page for
+# debugging purposes, using calls such console.log() and console.error().
+btnPageLogging=Beleženje
+# LOCALIZATION NOTE (tipPageLogging):
+#
+# This is used as the text of the tool tip for the "Logging" button on
+# the toolbar.
+tipPageLogging=Beleži sporočila, poslana objektu "console"
+btnConsoleErrors=Napake
+tipConsoleErrors=Beleži klice console.error()
+btnConsoleInfo=Podatki
+tipConsoleInfo=Beleži klice console.info()
+btnConsoleWarnings=Opozorila
+tipConsoleWarnings=Beleži klice console.warn()
+btnConsoleLog=Beležke
+tipConsoleLog=Beleži klice console.log()
+btnGlobal=Globalna sporočila
+tipGlobal=Preklopi beleženje globalnih sporočil
+localConsole=Krajevna konzola
+clearConsoleCmd.label=Počisti konzolo
+clearConsoleCmd.accesskey=o
+# LOCALIZATION NOTE (btnClear):
+#
+# This is used as the text of the "Clear" button for the toolbar. It clears the
+# contents of the console.
+btnClear=Počisti
+stringFilter=Iskanje
+close.button=Zapri
+close.accesskey=Z
+update.button=Posodobi
+update.accesskey=P
+# LOCALIZATION NOTE FOR `jsPropertyTitle` AND `jsPropertyInspectTitle`:
+#
+# The "PropertyPanel" is used to display a JS object to the user.
+# If it is clear which object is being inspected (e.g., window, document object)
+# the title of the panel is based on the `jsPropertyInspectTitle` string.
+# If it isn't clear which object is being inspected, the `jsPropertyTitle` string
+# gets used. This can be the case when the user logs an object to the WebConsole
+# output using the console.log(aObjectToInspect) method.
+#
+# You can find a screenshot of the PropertyPanel here:
+#   https://bug585030.bugzilla.mozilla.org/attachment.cgi?id=464034
+jsPropertyTitle=Pregledovalnik
+# LOCALIZATION NOTE (jsPropertyInspectTitle):
+#
+# The %S is replaced by the evaluated code the user clicked on in the console.
+#
+# Example: The user executed `window.document` in the WebConsole. The `document`
+# object is written to the output. If the user clicks on the `document` output
+# in the console, a PropertyPanel will show up. The title of the PropertyPanel
+# is set to `Inspect: window.document` because the clicked `document` object was
+# evaluated based on the `window.document` string.
+jsPropertyInspectTitle=Pregledovalnik: %S
+saveBodies.label=Beleži telo zahtevka in odgovora
+saveBodies.accesskey=L
+copyCmd.label=Kopiraj
+copyCmd.accesskey=K
+selectAllCmd.label=Izberi vse
+selectAllCmd.accesskey=v
+# LOCALIZATION NOTE (timestampFormat): %1$02S = hours (24-hour clock),
+# %2$02S = minutes, %3$02S = seconds, %4$03S = milliseconds.
+timestampFormat=%02S:%02S:%02S.%03S
+
+helperFuncUnsupportedTypeError=Na tej vrsti objekta ni mogoče klicati pprint.
+NetworkPanel.label=Preglej omrežni zahtevek
+# LOCALIZATION NOTE (NetworkPanel.deltaDurationMS):
+#
+# This string is used to show the duration between two network events (e.g
+# request and respones header or response header and response body).
+NetworkPanel.durationMS=%S ms
+# LOCALIZATION NOTE (NetworkPanel.imageSizeDeltaDurationMS):
+# This string is used to show the duration between the response header and the
+# response body event. It also shows the size of the received or cached image.
+#
+# The first %S is replace by the width of the inspected image.
+# The second %S is replaced by the height of the inspected image.
+# The third %S is replaced by the duration between the response header and the
+# response body event.
+NetworkPanel.imageSizeDeltaDurationMS=%Sx%S px, Δ%S ms
+# LOCALIZATION NOTE (NetworkPanel.responseBodyUnableToDisplay.content):
+#
+# This string is displayed within the response body section of the NetworkPanel
+# if the content type of the network request can't be displayed in the
+# NetworkPanel. E.g. any kind of text is easy to display, but some audio or
+# flash data received from the server can't be displayed.
+#
+# The %S is replaced by the content type, that can't be displayed, examples are
+#  o application/x-shockwave-flash
+#  o music/crescendo
+NetworkPanel.responseBodyUnableToDisplay.content=Ni mogoče prikazati odgovorov vrste "%S"
+ConsoleAPIDisabled=Programski vmesnik za beleženje v spletno konzolo (console.log, console.info, console.warn, console.error) je onemogočil skript na tej strani.
+
+# LOCALIZATION NOTE (webConsolePosition): The label shown for the menu which
+# allows the user to toggle between the Web Console positioning types.
+webConsolePosition=Položaj
+
+# LOCALIZATION NOTE (webConsolePositionTooltip): The tooltip shown when the user
+# hovers the Position button in the Web Console toolbar.
+webConsolePositionTooltip=Namesti Spletno konozolo nad ali pod dokument
+
+# LOCALIZATION NOTE (webConsolePositionAbove): When this option is selected the
+# Web Console interface is displayed above the web page.
+webConsolePositionAbove=Nad
+
+# LOCALIZATION NOTE (webConsolePositionBelow): When this option is selected the
+# Web Console interface is displayed below the web page.
+webConsolePositionBelow=Pod
+
+# LOCALIZATION NOTE (webConsolePositionWindow): When this option is selected the
+# Web Console interface is displayed in a floating panel.
+webConsolePositionWindow=Okno
+
+# LOCALIZATION NOTE (webConsoleWindowTitleAndURL): The Web Console floating
+# panel title, followed by the web page URL.
+# For RTL languages you need to set the LRM in the string to give the URL
+# the correct direction.
+webConsoleWindowTitleAndURL=Spletna konzola - %S
+
+# LOCALIZATION NOTE (scratchpad.linkText):
+# The text used in the right hand side of the web console command line when
+# Javascript is being entered, to indicate how to jump into scratchpad mode
+scratchpad.linkText=Shift+RETURN - Odpri v beležnici
+
+# LOCALIZATION NOTE (gcliterm.instanceLabel): The console displays
+# objects using their type (from the constructor function) in this descriptive
+# string
+gcliterm.instanceLabel=Primerek %S
+
+# LOCALIZATION NOTE (Autocomplete.label):
+# The autocomplete popup panel label/title.
+Autocomplete.label=Okno za samodokončanje
+
+# LOCALIZATION NOTE (stacktrace.anonymousFunction):
+# This string is used to display JavaScript functions that have no given name -
+# they are said to be anonymous. See stacktrace.outputMessage.
+stacktrace.anonymousFunction=<anonimno>
+
+# LOCALIZATION NOTE (stacktrace.outputMessage):
+# This string is used in the Web Console output to identify a web developer call
+# to console.trace(). The stack trace of JavaScript function calls is displayed.
+# In this minimal message we only show the last call.
+stacktrace.outputMessage=Sled sklada v %S, fukcija %S, vrstica %S.
+
+# LOCALIZATION NOTE (timerStarted):
+# This string is used to display the result of the console.time() call.
+# %S=name of timer
+timerStarted=%S: merilnik časa sprožen
+
+# LOCALIZATION NOTE (timeEnd):
+# This string is used to display the result of the console.timeEnd() call.
+# %1$S=name of timer, %2$S=number of milliseconds
+timeEnd=%1$S: %2$S ms
+
+# LOCALIZATION NOTE (Autocomplete.blank):
+# This string is used when inputnode string containing anchor doesn't
+# doesn't matches to any property in the content.
+Autocomplete.blank=  <- ni zadetkov
+
+maxTimersExceeded=Največje dovoljeno število merilnikov časa na strani je bilo preseženo.
--- a/browser/chrome/browser/feeds/subscribe.properties
+++ b/browser/chrome/browser/feeds/subscribe.properties
@@ -1,11 +1,11 @@
 linkTitleTextFormat=Pojdi na %S
 addHandler=Dodaj "%S" (%S) kot bralnik virov?
-addHandlerAddButton=Dodaj bralnika virov
+addHandlerAddButton=Dodaj bralnik virov
 addHandlerAddButtonAccesskey=O
 handlerRegistered="%S" je že registriran bralnik virov
 liveBookmarks=Živi zaznamki
 subscribeNow=Naroči se zdaj
 chooseApplicationMenuItem=Izberi program ...
 chooseApplicationDialogTitle=Izbira programa
 alwaysUse=Vedno uporabi "%S" za naročanje na vire
 mediaLabel=Večpredstavne datoteke
@@ -28,19 +28,19 @@ gigabyte=GB
 alwaysUseForFeeds=Vedno uporabi %S za naročanje na vire.
 alwaysUseForAudioPodcasts=Vedno uporabi %S za naročanje na podcaste.
 alwaysUseForVideoPodcasts=Vedno uporabi %S za naročanje na video podcaste.
 
 subscribeFeedUsing=Naroči se na ta vir z uporabo
 subscribeAudioPodcastUsing=Naroči se na ta podcast z uporabo
 subscribeVideoPodcastUsing=Naroči se na ta video podcast z uporabo
 
-feedSubscriptionFeed1=To je "vir" pogosto spreminjajoče vsebine na tej strani.
-feedSubscriptionAudioPodcast1=To je "podcast" pogosto spreminjajoče vsebine na tej strani.
-feedSubscriptionVideoPodcast1=To je "video podcast" pogosto spreminjajoče vsebine na tej strani.
+feedSubscriptionFeed1=To je "vir" vsebine na tej strani, ki se pogosto spreminja.
+feedSubscriptionAudioPodcast1=To je "podcast" vsebine na tej strani, ki se pogosto spreminja.
+feedSubscriptionVideoPodcast1=To je "video podcast" vsebine na tej strani, ki se pogosto spreminja.
 
 feedSubscriptionFeed2=Na ta vir se lahko naročite in ob spremembah vsebine boste prejemali posodobitve.
 feedSubscriptionAudioPodcast2=Na ta podcast se lahko naročite in ob spremembah vsebine boste prejemali posodobitve.
 feedSubscriptionVideoPodcast2=Na ta video podcast se lahko naročite in ob spremembah vsebine boste prejemali posodobitve.
 
 # Protocol Handling
 # "Add %appName (%appDomain) as an application for %protocolType links?"
 addProtocolHandler=Dodaj %S (%S) kot program za povezave %S?
--- a/browser/chrome/browser/migration/migration.dtd
+++ b/browser/chrome/browser/migration/migration.dtd
@@ -1,25 +1,25 @@
 
 <!ENTITY migrationWizard.title "Čarovnik za uvoz">
 
 <!ENTITY importFrom.label "Uvozi možnosti, zaznamke, zgodovino, gesla in ostale podatke iz:">
 <!ENTITY importFromUnix.label "Uvozi nastavitve, zaznamke, zgodovino, gesla in ostale podatke iz:">
-<!ENTITY importFromBookmarks.label "Zaznamke uvozi iz:">
+<!ENTITY importFromBookmarks.label "Uvozi zaznamke iz:">
 
 <!ENTITY importFromIE.label "Microsoft Internet Explorerja">
 <!ENTITY importFromIE.accesskey "M">
 <!ENTITY importFromNothing.label "Ne uvozi ničesar">
 <!ENTITY importFromNothing.accesskey "N">
-<!ENTITY importFromSeamonkey.label "Netscapea 6, 7 ali Mozille 1.x">
-<!ENTITY importFromSeamonkey.accesskey "N">
-<!ENTITY importFromOpera.label "Opere">
-<!ENTITY importFromOpera.accesskey "O">
 <!ENTITY importFromSafari.label "Safarija">
 <!ENTITY importFromSafari.accesskey "S">
+<!ENTITY importFromChrome.label         "Chroma">
+<!ENTITY importFromChrome.accesskey     "C">
+<!ENTITY importFromFirefox.label        "Firefoxa">
+<!ENTITY importFromFirefox.accesskey    "X">
 <!ENTITY importFromHTMLFile.label "Iz datoteke HTML">
 <!ENTITY importFromHTMLFile.accesskey "F">
 
 <!ENTITY noMigrationSources.label "Ni bilo mogoče najti nobenega programa z zaznamki, zgodovino ali gesli za uvoz.">
 
 <!ENTITY importSource.title "Uvoz nastavitev in podatkov">
 <!ENTITY importItems.title "Možnosti uvoza">
 <!ENTITY importItems.label "Izberite, kaj želite uvoziti:">
--- a/browser/chrome/browser/migration/migration.properties
+++ b/browser/chrome/browser/migration/migration.properties
@@ -1,54 +1,49 @@
 profileName_format=%S %S
 
 # Browser Specific
 sourceNameIE=Internet Explorer
-sourceNameSeamonkey=Netscape 6/7/Mozilla
-sourceNameOpera=Opera
 sourceNameSafari=Safari
+sourceNameChrome=Google Chrome
+sourceNameFirefox=Mozilla Firefox
 
 importedBookmarksFolder=Od %S
 importedSearchURLsFolder=Iskanje po ključni besedi (od %S)
 importedSearchURLsTitle=Iskanje na %S
 importedSearchUrlDesc=Vnesite "%S <iskani niz>" v vrstico z naslovom, če želite iskati z iskalnikom %S.
 
-importedSeamonkeyBookmarksTitle=Iz Netscapea 6/7 ali Mozille
 importedSafariBookmarks=Iz Safarija
-importedOperaHotlistTitle=Iz Opere
-importedOperaSearchUrls=Iskanje po ključni besedi (iz Opere)
 
 # Import Sources
 1_ie=Internetne možnosti
-1_opera=Nastavitve
-1_seamonkey=Nastavitve
 1_safari=Nastavitve
+1_chrome=Nastavitve
 
 2_ie=Piškoti
-2_opera=Piškoti
-2_seamonkey=Piškoti
 2_safari=Piškoti
+2_chrome=Piškoti
+2_firefox=Piškoti
 
 4_ie=Zgodovina brskanja
-4_opera=Zgodovina brskanja
-4_seamonkey=Zgodovina brskanja
 4_safari=Zgodovina brskanja
+4_chrome=Zgodovina brskanja
+4_firefox=Zgodovina brskanja
 
 8_ie=Shranjeni obrazci
-8_opera=Shranjeni obrazci
-8_seamonkey=Shranjeni obrazci
 8_safari=Shranjeni obrazci
+8_chrome=Shranjeni obrazci
+8_firefox=Shranjeni obrazci
 
 16_ie=Shranjena gesla
-16_opera=Shranjena gesla
-16_seamonkey=Shranjena gesla
 16_safari=Shranjena gesla
+16_chrome=Shranjena gesla
+16_firefox=Shranjena gesla
 
 32_ie=Priljubljene
-32_opera=Zaznamki
-32_seamonkey=Zaznamki
 32_safari=Zaznamki
+32_chrome=Zaznamki
+32_firefox=Zaznamki
 
 64_ie=Ostali podatki
-64_opera=Ostali podatki
-64_seamonkey=Ostali podatki
 64_safari=Ostali podatki
+64_chrome=Ostali podatki
 
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/newTab.dtd
@@ -0,0 +1,2 @@
+<!-- These strings are used in the about:newtab page -->
+<!ENTITY newtab.pageTitle "Nov zavihek">
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/newTab.properties
@@ -0,0 +1,5 @@
+newtab.pin=Pripni stran na njen trenuten položaj
+newtab.unpin=Odpni stran
+newtab.block=Odstrani stran
+newtab.show=Prikaži stran Nov zavihek
+newtab.hide=Skrij stran Nov zavihek
--- a/browser/chrome/browser/openLocation.dtd
+++ b/browser/chrome/browser/openLocation.dtd
@@ -1,10 +1,10 @@
 <!-- extracted from content/openLocation.xul -->
 
-<!ENTITY enter.label "Vnesite spletni naslov (URL) ali navedite lokalno datoteko, ki jo želite odpreti:">
+<!ENTITY enter.label "Vnesite spletni naslov (URL) ali navedite krajevno datoteko, ki jo želite odpreti:">
 <!ENTITY chooseFile.label "Izberi datoteko ...">
 <!ENTITY newWindow.label "Novo okno">
 <!ENTITY newTab.label "Nov zavihek">
 <!ENTITY topTab.label "Trenutni zavihek">
 <!ENTITY caption.label "Odpri spletno mesto">
 <!ENTITY openWhere.label "Odpri v:">
 <!ENTITY openBtn.label "Odpri">
--- a/browser/chrome/browser/pageInfo.dtd
+++ b/browser/chrome/browser/pageInfo.dtd
@@ -89,17 +89,17 @@
 <!ENTITY permTab.accesskey "D">
 <!ENTITY permUseDefault "Uporabi privzeto">
 <!ENTITY  permAskAlways         "Vedno vprašaj">
 <!ENTITY permAllow "Dovoli">
 <!ENTITY permAllowSession "Dovoli v tej seji">
 <!ENTITY permBlock "Prepovej">
 <!ENTITY permissionsFor "Dovoljenja za:">
 <!ENTITY permImage "Naloži slike">
-<!ENTITY permPopup "Odpri pojavna okna">
+<!ENTITY permPopup "Odpri neželena okna">
 <!ENTITY permCookie "Nastavi piškote">
 <!ENTITY permInstall "Namesti razširitve in teme">
 <!ENTITY  permGeo               "Objavi položaj">
 
 <!ENTITY  permIndexedDB              "Shramba za delo brez povezave">
 <!ENTITY  permClearStorage           "Počisti shrambo">
 <!ENTITY  permClearStorage.accesskey "P">
 
--- a/browser/chrome/browser/pageInfo.properties
+++ b/browser/chrome/browser/pageInfo.properties
@@ -46,16 +46,19 @@ unknown=Neznano
 notset=Ni določeno
 yes=Da
 no=Ne
 
 mediaImg=Slika
 mediaVideo=Video
 mediaAudio=Zvok
 mediaBGImg=Ozadje
+mediaBorderImg=Okvir
+mediaListImg=Oznaka
+mediaCursor=Kazalec
 mediaObject=Predmet
 mediaEmbed=Znotraj strani
 mediaLink=Ikona
 mediaInput=Vnos
 mediaFileSize=%S KB
 mediaSize=%Spx × %Spx
 mediaSelectFolder=Izberite mapo za shranjevanje slik
 mediaBlockImage=Prepovej slike s strani %S
--- a/browser/chrome/browser/places/bookmarkProperties.properties
+++ b/browser/chrome/browser/places/bookmarkProperties.properties
@@ -1,15 +1,15 @@
 dialogAcceptLabelAddItem=Dodaj
 dialogAcceptLabelSaveItem=Shrani
 dialogAcceptLabelAddLivemark=Naroči se
 dialogAcceptLabelAddMulti=Dodaj zaznamke
-dialogAcceptLabelEdit=Shrani spremembe
-dialogTitleAddBookmark=Dodaj zaznamek
-dialogTitleAddLivemark=Dodaj živi zaznamek
-dialogTitleAddFolder=Dodaj mapo
-dialogTitleAddMulti=Dodaj vse zavihke med zaznamke
+dialogAcceptLabelEdit=Shrani
+dialogTitleAddBookmark=Nov zaznamek
+dialogTitleAddLivemark=Naroči se z živim zaznamkom
+dialogTitleAddFolder=Nova mapa
+dialogTitleAddMulti=Novi zaznamki
 dialogTitleEdit=Lastnosti "%S"
 
 bookmarkAllTabsDefault=[ime mape]
 newFolderDefault=Nova mapa
 newBookmarkDefault=Nov zaznamek
 newLivemarkDefault=Nov živi zaznamek
--- a/browser/chrome/browser/places/places.dtd
+++ b/browser/chrome/browser/places/places.dtd
@@ -23,20 +23,22 @@
 <!ENTITY view.sortDescending.label "Razvrsti Ž > A">
 <!ENTITY view.sortDescending.accesskey "Ž">
 
 <!ENTITY cmd.findInBookmarks.label "Najdi v zaznamkih …">
 <!ENTITY cmd.findInBookmarks.accesskey "N">
 <!ENTITY cmd.findCurrent.label "Najdi v trenutni zbirki">
 <!ENTITY cmd.findCurrent.accesskey "a">
 
-<!ENTITY cmd.exportHTML.label "Izvozi HTML …">
-<!ENTITY cmd.exportHTML.accesskey "z">
-<!ENTITY cmd.importHTML.label "Uvozi HTML …">
-<!ENTITY cmd.importHTML.accesskey "U">
+<!ENTITY importBookmarksFromHTML.label     "Uvozi zaznamke iz HTML …">
+<!ENTITY importBookmarksFromHTML.accesskey "U">
+<!ENTITY exportBookmarksToHTML.label       "Izvozi zaznamke v HTML …">
+<!ENTITY exportBookmarksToHTML.accesskey   "z">
+<!ENTITY importOtherBrowser.label          "Uvozi podatke drugega brskalnika …">
+<!ENTITY importOtherBrowser.accesskey      "A">
 
 <!ENTITY cmd.backup.label "Varnostna kopija …">
 <!ENTITY cmd.backup.accesskey "V">
 <!ENTITY cmd.restore2.label "Povrni">
 <!ENTITY cmd.restore2.accesskey "R">
 <!ENTITY cmd.restoreFromFile.label "Izberi datoteko …">
 <!ENTITY cmd.restoreFromFile.accesskey "I">
 
--- a/browser/chrome/browser/places/places.properties
+++ b/browser/chrome/browser/places/places.properties
@@ -37,34 +37,38 @@ view.sortBy.dateAdded.label=Razvrsti po 
 view.sortBy.dateAdded.accesskey=a
 view.sortBy.lastModified.label=Razvrsti po datumu zadnje spremembe
 view.sortBy.lastModified.accesskey=M
 view.sortBy.tags.label=Razvrsti po oznakah
 view.sortBy.tags.accesskey=T
 
 searchBookmarks=Iskanje po zaznamkih
 searchHistory=Iskanje po zgodovini
+searchDownloads=Iskanje po prenosih
 searchCurrentDefault=Išči v '%S'
 findInPrefix=Najdi v '%S' ...
 
 tabs.openWarningTitle=Potrdi odpiranje
-tabs.openWarningMultipleBranded=Odprli boste %S zavihkov.  To lahko upočasni %S med nalaganjem strani.  Ali ste prepričani, da želite nadaljevati?
+tabs.openWarningMultipleBranded=Odprli boste %S zavihkov. To lahko upočasni %S med nalaganjem strani. Ali ste prepričani, da želite nadaljevati?
 tabs.openButtonMultiple=Odpri zavihke
 tabs.openWarningPromptMeBranded=Opozori me, ko lahko odpiranje veliko zavihkov naenkrat upočasni %S
 
 SelectImport=Uvozi datoteko z zaznamki
 EnterExport=Izvozi datoteko zaznamkov
 
 saveSearch.title=Shrani iskanje
 saveSearch.inputLabel=Ime:
 saveSearch.inputDefaultText=Nova poizvedba
 
 detailsPane.noItems=Brez predmetov
-detailsPane.oneItem=En predmet
-detailsPane.multipleItems=%S predmetov
+# LOCALIZATION NOTE (detailsPane.itemsCountLabel): Semi-colon list of plural forms.
+# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
+# #1 number of items
+# example: 111 items
+detailsPane.itemsCountLabel=En predmet;#1 predmetov
 
 mostVisitedTitle=Najbolj obiskano
 recentlyBookmarkedTitle=Nedavni zaznamki
 recentTagsTitle=Nedavne oznake
 
 OrganizerQueryHistory=Zgodovina
 OrganizerQueryDownloads=Prenosi
 OrganizerQueryAllBookmarks=Vsi zaznamki
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/preferences/aboutPermissions.dtd
@@ -0,0 +1,35 @@
+<!ENTITY permissionsManager.title        "Upravitelj dovoljenj">
+
+<!ENTITY sites.search                    "Išči po straneh">
+<!ENTITY sites.allSites                  "Vse strani">
+
+<!-- LOCALIZATION NOTE (permissions.header.start, permissions.header.end): These strings
+     surround the host name of the site to make the header for the permissions page.
+     example: "Permissions for mozilla.org" -->
+<!ENTITY header.site.start               "Dovoljenja za">
+<!ENTITY header.site.end                 "">
+
+<!ENTITY header.defaults                 "Privzeta dovoljenja za vse strani">
+
+<!ENTITY permissions.forgetSite          "Pozabi na to stran">
+
+<!ENTITY permission.alwaysAsk            "Vedno vprašaj">
+<!ENTITY permission.allow                "Dovoli">
+<!ENTITY permission.allowForSession      "Dovoli za sejo">
+<!ENTITY permission.block                "Zavrni">
+
+<!ENTITY password.label                  "Shranjevanje gesel">
+<!ENTITY password.manage                 "Upravljanje gesel…">
+
+<!ENTITY cookie.label                    "Shranjevanje piškotov">
+<!ENTITY cookie.remove                   "Odstrani piškote">
+<!ENTITY cookie.manage                   "Upravljanje piškotov…">
+<!ENTITY cookie.removeAll                "Odstrani vse piškote">
+
+<!ENTITY geo.label                       "Objava položaja">
+
+<!-- LOCALIZATION NOTE (indexedDB.label): This is describing indexedDB storage
+     using the same language used for the permIndexedDB string in browser/pageInfo.dtd -->
+<!ENTITY indexedDB.label                 "Shramba za delo brez povezave">
+
+<!ENTITY popup.label                     "Odpiranje neželenih oken">
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/preferences/aboutPermissions.properties
@@ -0,0 +1,5 @@
+# LOCALIZATION NOTE (visitCount): #1 is the number of history visits for a site
+visitCount=Število obiskov: #1;Število obiskov: #1
+
+passwordsCount=Število shranjenih gesel za to stran: #1.;Število shranjenih gesel za to stran: #1.
+cookiesCount=Število shranjenih piškotov za to stran: #1.;Število shranjenih piškotov za to stran: #1.
--- a/browser/chrome/browser/preferences/advanced-scripts.dtd
+++ b/browser/chrome/browser/preferences/advanced-scripts.dtd
@@ -33,16 +33,16 @@
    - the terms of any one of the MPL, the GPL or the LGPL.
    -
 #endif
    - ***** END LICENSE BLOCK ***** -->
 
 <!ENTITY advancedJSDialog.title "Napredne nastavitve JavaScript">
 <!ENTITY window.width "39em">
 
-<!ENTITY allowScripts.label "Dovoli, da skripta:">
+<!ENTITY allowScripts.label "Dovoli, da skripti:">
 
-<!ENTITY moveResizeWindows.label "premikajo ali večajo oz. manjšajo okna">
-<!ENTITY moveResizeWindows.accesskey "P">
-<!ENTITY raiseLowerWindows.label "dvignejo ali spustijo okna">
+<!ENTITY moveResizePopupWindows.label     "Spreminjajo položaj in velikost oken">
+<!ENTITY moveResizePopupWindows.accesskey "P">
+<!ENTITY raiseLowerWindows.label "Postavljajo okna v ospredje in ozadje">
 <!ENTITY raiseLowerWindows.accesskey "D">
-<!ENTITY disableContextMenus.label "onemogočijo ali zamenjajo vsebinske menije">
+<!ENTITY disableContextMenus.label "Onemogočajo in spreminjajo priročne menije">
 <!ENTITY disableContextMenus.accesskey "O">
--- a/browser/chrome/browser/preferences/advanced.dtd
+++ b/browser/chrome/browser/preferences/advanced.dtd
@@ -16,77 +16,84 @@
 <!ENTITY useAutoScroll.label "Uporabljaj samodrsenje">
 <!ENTITY useAutoScroll.accesskey "s">
 <!ENTITY useSmoothScrolling.label "Uporabljaj gladko drsenje">
 <!ENTITY useSmoothScrolling.accesskey "g">
 <!ENTITY allowHWAccel.label              "Uporabljaj strojno pospeševanje, ko je na voljo">
 <!ENTITY allowHWAccel.accesskey          "p">
 <!ENTITY checkSpelling.label "Preverjaj črkovanje besed, medtem ko pišem">
 <!ENTITY checkSpelling.accesskey "b">
-<!ENTITY doNotTrack.label                "Spletnim stranem sporoči, naj mi ne sledijo">
-<!ENTITY doNotTrack.accesskey            "d">
 
 <!ENTITY systemDefaults.label "Privzete vrednosti">
-<!--XXX-->
 <!ENTITY alwaysCheckDefault.label "Ob zagonu vedno preveri, ali je &brandShortName; privzeti brskalnik">
 <!ENTITY alwaysCheckDefault.accesskey "v">
 <!ENTITY checkNow.label "Preveri zdaj">
 <!ENTITY checkNow.accesskey "E">
 <!ENTITY submitCrashes.label             "Pošlji poročila o sesutju">
 <!ENTITY submitCrashes.accesskey         "S">
+<!ENTITY submitTelemetry.label           "Pošlji podatke o zmogljivosti">
+<!ENTITY submitTelemetry.accesskey       "P">
 
-<!ENTITY networkTab.label "Mreža">
+<!ENTITY networkTab.label "Omrežje">
 
 <!ENTITY connection.label "Povezava">
 
 <!ENTITY connectionDesc.label "Določite, kako naj se &brandShortName; poveže na internet.">
-<!ENTITY connectionSettings.label "Nastavitve ...">
+<!ENTITY connectionSettings.label "Nastavitve …">
 <!ENTITY connectionSettings.accesskey "n">
 
-<!ENTITY offlineStorage.label "Shramba brez povezave">
+<!ENTITY httpCache.label                 "Vsebina v predpomnilniku">
+
+<!ENTITY offlineStorage2.label "Vsebina in uporabniški podatki za delo brez povezave">
 
 <!-- LOCALIZATION NOTE:
   The entities limitCacheSizeBefore.label and limitCacheSizeAfter.label appear on a single
   line in preferences as follows:
 
   &limitCacheSizeBefore.label [textbox for cache size in MB] &limitCacheSizeAfter.label;
 -->
 <!ENTITY limitCacheSizeBefore.label      "Omeji velikost predpomnilnika na">
 <!ENTITY limitCacheSizeBefore.accesskey  "l">
 <!ENTITY limitCacheSizeAfter.label       "MB">
 <!ENTITY clearCacheNow.label "Počisti zdaj">
 <!ENTITY clearCacheNow.accesskey "O">
+<!ENTITY clearOfflineAppCacheNow.label   "Počisti zdaj">
+<!ENTITY clearOfflineAppCacheNow.accesskey "Z">
 <!ENTITY overrideSmartCacheSize.label    "Prezri samodejno upravljanje predpomnilnika">
 <!ENTITY overrideSmartCacheSize.accesskey "o">
 
-<!ENTITY updateTab.label "Posodobitev">
+<!ENTITY updateTab.label "Posodobitve">
+
+<!ENTITY updateApp.label                 "Posodobitve &brandShortName;a:">
+<!ENTITY updateAuto.label                "Samodejno nameščaj posodobitve (priporočeno za večjo varnost)">
+<!ENTITY updateAuto.accesskey            "A">
+<!ENTITY updateCheck.label               "Preverjaj posodobitve, vendar mi prepusti odločitev o nameščanju">
+<!ENTITY updateCheck.accesskey           "P">
+<!ENTITY updateManual.label              "Nikoli ne preverjaj posodobitev (ni priporočeno zaradi varnosti)">
+<!ENTITY updateManual.accesskey          "N">
 
-<!ENTITY autoCheck.label "Samodejno preverjaj, če obstajajo posodobitve za:">
-<!ENTITY enableAppUpdate.label "&brandShortName;">
-<!ENTITY enableAppUpdate.accesskey "F">
-<!ENTITY enableAddonsUpdate2.label       "Dodatke">
-<!ENTITY enableAddonsUpdate2.accesskey   "D">
-<!ENTITY enableSearchUpdate.label "Iskalnike">
-<!ENTITY enableSearchUpdate.accesskey "I">
-<!ENTITY whenUpdatesFound.label "Če obstajajo posodobitve za &brandShortName;:">
-<!ENTITY askMe.label "me vprašaj, kaj storiti">
-<!ENTITY askMe.accesskey "k">
-<!ENTITY modeAutomatic.label "samodejno prenesi in namesti posodobitev">
-<!ENTITY modeAutomatic.accesskey "p">
-<!ENTITY modeAutoAddonWarn.label "opozori me, če bo to onemogočilo nameščene razširitve in teme">
-<!ENTITY modeAutoAddonWarn.accesskey "O">
-<!ENTITY updateHistory.label "Pokaži zgodovino posodobitev">
-<!ENTITY updateHistory.accesskey "z">
+<!ENTITY updateAutoAddonWarn.label       "Obvesti me, ali bo to povzročilo nezdružljivost mojih dodatkov">
+<!ENTITY updateAutoAddonWarn.accesskey   "O">
+
+<!ENTITY updateHistory.label             "Zgodovina posodobitev">
+<!ENTITY updateHistory.accesskey         "Z">
+
+<!ENTITY useService.label                "Uporabi storitev za nameščanje posodobitev v ozadju">
+<!ENTITY useService.accesskey            "s">
+
+<!ENTITY updateOthers.label              "Samodejno posodabljaj:">
+<!ENTITY enableSearchUpdate.label        "Iskalnike">
+<!ENTITY enableSearchUpdate.accesskey    "I">
 
 <!ENTITY offlineNotify.label "Opozori me, ko želi spletna stran shraniti podatke za delo brez povezave">
 <!ENTITY offlineNotify.accesskey "T">
 <!ENTITY offlineNotifyExceptions.label "Izjeme ...">
 <!ENTITY offlineNotifyExceptions.accesskey "i">
 
-<!ENTITY offlineAppsList.label "Naslednje spletne strani so shranile podatke za delo brez povezave:">
+<!ENTITY offlineAppsList2.label "Naslednje spletne strani lahko shranjujejo podatke za delo brez povezave:">
 <!ENTITY offlineAppsList.height "7em">
 <!ENTITY offlineAppsListRemove.label "Odstrani ...">
 <!ENTITY offlineAppsListRemove.accesskey "R">
 <!ENTITY offlineAppRemove.confirm "Odstrani ">
 
 <!ENTITY encryptionTab.label "Šifriranje">
 
 <!ENTITY protocols.label "Protokoli">
--- a/browser/chrome/browser/preferences/colors.dtd
+++ b/browser/chrome/browser/preferences/colors.dtd
@@ -11,12 +11,12 @@
 <!ENTITY backgroundColor.label "Ozadje:">
 <!ENTITY backgroundColor.accesskey "o">
 <!ENTITY useSystemColors.label "Uporabi barve sistema">
 <!ENTITY useSystemColors.accesskey "s">
 
 <!ENTITY underlineLinks.label "Podčrtaj povezave">
 <!ENTITY underlineLinks.accesskey "p">
 <!ENTITY links "Barve povezav">
-<!ENTITY linkColor.label "Neobiskanje povezave:">
+<!ENTITY linkColor.label "Neobiskane povezave:">
 <!ENTITY linkColor.accesskey "n">
 <!ENTITY visitedLinkColor.label "Že obiskane povezave:">
 <!ENTITY visitedLinkColor.accesskey "o">
--- a/browser/chrome/browser/preferences/content.dtd
+++ b/browser/chrome/browser/preferences/content.dtd
@@ -1,9 +1,9 @@
-<!ENTITY blockPopups.label "Prepovej nezahtevana okna">
+<!ENTITY blockPopups.label "Prepovej neželena okna">
 <!ENTITY blockPopups.accesskey "r">
 <!ENTITY popupExceptions.label "Izjeme ...">
 <!ENTITY popupExceptions.accesskey "I">
 
 <!ENTITY loadImages.label "Samodejno nalagaj slike">
 <!ENTITY loadImages.accesskey "S">
 <!ENTITY exceptions.label "Izjeme ...">
 <!ENTITY exceptions.accesskey "z">
--- a/browser/chrome/browser/preferences/fonts.dtd
+++ b/browser/chrome/browser/preferences/fonts.dtd
@@ -5,24 +5,24 @@
 
 <!ENTITY language.label "Pisave za:">
 <!ENTITY language.accesskey "V">
 
 <!ENTITY size.label "Velikost:">
 <!ENTITY sizeProportional.accesskey "l">
 <!ENTITY sizeMonospace.accesskey "e">
 
-<!ENTITY proportional.label "Spremenljivokoračna pisava:">
+<!ENTITY proportional.label "Proporcionalna pisava:">
 <!ENTITY proportional.accesskey "S">
 
 <!ENTITY serif.label "Serif:">
 <!ENTITY serif.accesskey "S">
 <!ENTITY sans-serif.label "Sans-serif:">
 <!ENTITY sans-serif.accesskey "n">
-<!ENTITY monospace.label "Enokoračna pisava:">
+<!ENTITY monospace.label "Enoširinska pisava:">
 <!ENTITY monospace.accesskey "E">
 
 <!ENTITY font.langGroup.latin1 "zahodno">
 <!ENTITY font.langGroup.latin2 "srednjeevropsko">
 <!ENTITY font.langGroup.japanese "japonsko">
 <!ENTITY font.langGroup.trad-chinese "tradicionalno kitajsko (Tajvan)">
 <!ENTITY font.langGroup.simpl-chinese "poenostavljeno kitajsko">
 <!ENTITY font.langGroup.trad-chinese-hk "tradicionalno kitajsko (Hong Kong)">
@@ -38,23 +38,23 @@
 <!ENTITY font.langGroup.arabic "arabsko">
 <!ENTITY font.langGroup.devanagari "devanagari">
 <!ENTITY font.langGroup.tamil "tamilsko">
 <!ENTITY font.langGroup.armenian "armensko">
 <!ENTITY font.langGroup.bengali "bengalsko">
 <!ENTITY font.langGroup.canadian "Unified Canadian Syllabary">
 <!ENTITY font.langGroup.ethiopic "etiopsko">
 <!ENTITY font.langGroup.georgian "gruzijsko">
-<!ENTITY font.langGroup.gujarati "gujarati">
-<!ENTITY font.langGroup.gurmukhi "gurmukhi">
+<!ENTITY font.langGroup.gujarati "gudžaratsko">
+<!ENTITY font.langGroup.gurmukhi "gurmuksko">
 <!ENTITY font.langGroup.khmer "kmersko">
 <!ENTITY font.langGroup.malayalam "malajalamsko">
 <!ENTITY font.langGroup.oriya "orijansko">
 <!ENTITY font.langGroup.telugu "telugu">
-<!ENTITY font.langGroup.kannada "kannadsko">
+<!ENTITY font.langGroup.kannada "kanadsko">
 <!ENTITY font.langGroup.sinhala "singalsko">
 <!ENTITY  font.langGroup.tibetan                  "tibetansko">
 <!-- Minimum font size -->
 <!ENTITY minSize.label "Najmanjša velikost pisav:">
 <!ENTITY minSize.accesskey "m">
 <!ENTITY minSize.none "je ni">
 <!-- default font type -->
 
--- a/browser/chrome/browser/preferences/languages.dtd
+++ b/browser/chrome/browser/preferences/languages.dtd
@@ -1,12 +1,12 @@
 <!ENTITY window.width "30em">
 
 <!ENTITY languages.customize.Header "Jeziki">
-<!ENTITY languages.customize.prefLangDescript "Spletne strani včasih ponujajo več jezikov. Izberite željene jezike za prikaz strani v prednostnem vrstnem redu.">
+<!ENTITY languages.customize.prefLangDescript "Spletne strani včasih ponujajo več jezikov. Izberite želene jezike za prikaz strani v prednostnem vrstnem redu.">
 <!ENTITY languages.customize.active.label "Jeziki v prednostnem redu:">
 <!ENTITY languages.customize.moveUp.label "Premakni gor">
 <!ENTITY languages.customize.moveUp.accesskey "G">
 <!ENTITY languages.customize.moveDown.label "Premakni dol">
 <!ENTITY languages.customize.moveDown.accesskey "D">
 <!ENTITY languages.customize.deleteButton.label "Odstrani">
 <!ENTITY languages.customize.deleteButton.accesskey "R">
 <!ENTITY languages.customize.selectLanguage.label "Izberite dodaten jezik ...">
--- a/browser/chrome/browser/preferences/main.dtd
+++ b/browser/chrome/browser/preferences/main.dtd
@@ -1,22 +1,25 @@
 <!ENTITY startup.label "Zagon">
 
 <!ENTITY startupPage.label "Ko se &brandShortName; zažene:">
 <!ENTITY startupPage.accesskey "k">
 <!ENTITY startupHomePage.label "prikaži mojo domačo stran">
 <!ENTITY startupBlankPage.label "prikaži prazno stran">
 <!ENTITY startupLastSession.label "prikaži nazadnje odprta okna in zavihke">
+<!ENTITY restoreOnDemand.label     "Ne nalagaj zavihkov, dokler niso izbrani">
+<!ENTITY restoreOnDemand.accesskey "l">
+
 <!ENTITY homepage.label "Domača stran:">
 <!ENTITY homepage.accesskey "D">
 <!ENTITY useCurrentPage.label "Uporabi trenutno stran">
 <!ENTITY useCurrentPage.accesskey "T">
 <!ENTITY useMultiple.label "Uporabi trenutne strani">
-<!ENTITY useBookmark.label "Uporabi zaznamek">
-<!ENTITY useBookmark.accesskey "z">
+<!ENTITY chooseBookmark.label      "Uporabi zaznamek …">
+<!ENTITY chooseBookmark.accesskey  "z">
 <!ENTITY restoreDefault.label "Uporabi privzeto stran">
 <!ENTITY restoreDefault.accesskey "i">
 
 <!ENTITY downloads.label "Prenosi">
 
 <!ENTITY showWhenDownloading.label "Med prenašanjem prikaži okno s prenosi">
 <!ENTITY showWhenDownloading.accesskey "o">
 <!ENTITY closeWhenDone.label "in ga zapri, ko so vsi prenosi končani">
@@ -25,13 +28,13 @@
 <!ENTITY saveTo.accesskey "S">
 <!ENTITY chooseFolderWin.label "Prebrskaj ...">
 <!ENTITY chooseFolderWin.accesskey "b">
 <!ENTITY chooseFolderMac.label "Izberi ...">
 <!ENTITY chooseFolderMac.accesskey "b">
 <!ENTITY alwaysAsk.label "Pri vsakem prenosu vprašaj, kam želim shraniti datoteko">
 <!ENTITY alwaysAsk.accesskey "V">
 
-<!ENTITY addonsMgr.label "Razširitve in teme">
-<!ENTITY manageAddonsDescWin.label "Spremeni nastavitve razširitev in tem">
-<!ENTITY manageAddonsDescUnix2.label "Spremeni nastavitve razširitev in tem">
-<!ENTITY manageAddons.label "Razširitve in teme ...">
+<!ENTITY addonsMgr.label "Dodatki">
+<!ENTITY manageAddonsDescWin.label "Spremenite nastavitve svojih dodatkov">
+<!ENTITY manageAddonsDescUnix2.label "Spremenite nastavitve svojih dodatkov">
+<!ENTITY manageAddons.label "Upravljanje dodatkov ...">
 <!ENTITY manageAddons.accesskey "R">
--- a/browser/chrome/browser/preferences/preferences.dtd
+++ b/browser/chrome/browser/preferences/preferences.dtd
@@ -1,19 +1,19 @@
 
 <!ENTITY prefWindow.titleWin "Možnosti">
 <!ENTITY prefWindow.titleGNOME "Nastavitve &brandShortName;a">
 <!-- When making changes to prefWindow.styleWin test both Windows Classic and
      Luna since widget heights are different based on the OS theme -->
-<!ENTITY prefWinMinSize.styleWin2 "width: 42em; height: 37.5em;">
-<!ENTITY prefWinMinSize.styleMac "width: 47em; height: 40em;">
-<!ENTITY prefWinMinSize.styleGNOME "width: 42em; height: 39.5em;">
+<!ENTITY  prefWinMinSize.styleWin2      "width: 42em; min-height: 37.5em;">
+<!ENTITY  prefWinMinSize.styleMac       "width: 47em; min-height: 40em;">
+<!ENTITY  prefWinMinSize.styleGNOME     "width: 45.5em; min-height: 40.5em;">
 
 <!ENTITY paneGeneral.title "Splošno">
 <!ENTITY paneTabs.title "Zavihki">
 <!ENTITY paneContent.title "Vsebina">
 <!ENTITY paneApplications.title "Programi">
 <!ENTITY panePrivacy.title "Zasebnost">
 <!ENTITY paneSecurity.title "Varnost">
 <!ENTITY paneAdvanced.title "Napredno">
 
 <!-- LOCALIZATION NOTE (paneSync.title): This should match syncBrand.shortName.label in ../syncBrand.dtd -->
-<!ENTITY  paneSync.title          "Sinhronizacija">
+<!ENTITY  paneSync.title          "Usklajevanje">
--- a/browser/chrome/browser/preferences/preferences.properties
+++ b/browser/chrome/browser/preferences/preferences.properties
@@ -7,23 +7,23 @@ phishBeforeText=Če izberete to možnost, bodo naslovi strani, ki jih obiščete, poslani ponudniku storitve (%S). Za nadaljevanje morate prebrati in sprejeti pogoje storitve.
 
 #### Fonts
 
 labelDefaultFont=Privzeto (%S)
 
 #### Permissions Manager
 
 cookiepermissionstext=Določite, katere strani smejo vedno uporabljati piškote, in katere jih ne smejo nikoli. Vnesite točen naslov strani, nato pa kliknite gumb Prepovej, Dovoli v tej seji ali Dovoli.
-cookiepermissionstitle=Izjeme: Piškoti
-addonspermissionstext=Določite, katere strani smejo nameščati razširitve in teme. Vnesite točen naslov strani, nato pa kliknite gumb Dovoli.
-addons_permissions_title=Dovoljene strani: Namestitev razširitev in tem
-popuppermissionstext=Določite, katere strani smejo odpirati nezahtevana okna. Vnesite točen naslov strani, nato pa kliknite gumb Dovoli.
-popuppermissionstitle=Dovoljene strani: Nezahtevana okna
+cookiepermissionstitle=Izjeme: piškoti
+addonspermissionstext=Določite, katere strani smejo nameščati dodatke. Vnesite točen naslov strani, nato pa kliknite gumb Dovoli.
+addons_permissions_title=Dovoljene strani: namestitev dodatkov
+popuppermissionstext=Določite, katere strani smejo odpirati neželena okna. Vnesite točen naslov strani, nato pa kliknite gumb Dovoli.
+popuppermissionstitle=Dovoljene strani: neželena okna
 imagepermissionstext=Določite, katere strani smejo vedno nalagati slike, in katere jih ne smejo nikoli. Vnesite točen naslov strani, nato pa kliknite gumb Prepovej ali Dovoli.
-imagepermissionstitle=Izjeme: Slike
+imagepermissionstitle=Izjeme: slike
 invalidURI=Prosim, vnesite veljaven naslov.
 invalidURITitle=Neveljaven naslov
 
 #### Master Password
 
 pw_change2empty_in_fips_mode=Trenutno ste v načinu FIPS. FIPS zahteva glavno geslo, ki ni prazno.
 pw_change_failed_title=Sprememba gesla neuspešna
 
@@ -74,43 +74,50 @@ addLiveBookmarksInApp=Dodaj žive zaznamke v %S
 # %2$S = type (for example "application/pdf")
 typeDescriptionWithType=%S (%S)
 
 
 #### Cookie Viewer
 
 hostColon=Gostitelj:
 domainColon=Domena:
-forSecureOnly=Le kriptirane povezave
+forSecureOnly=Le šifrirane povezave
 forAnyConnection=Vse povezave
 expireAtEndOfSession=na koncu seje
 can=Dovoli
 canSession=Dovoli v tej seji
 cannot=Prepovej
 noCookieSelected=<ni izbranega>
 cookiesAll=Naslednji piškoti so shranjeni na vašem računalniku:
 cookiesFiltered=Naslednji piškoti ustrezajo iskanemu:
 
 #### Offline apps
 offlineAppRemoveTitle=Odstrani podatke strani za delo brez povezave
-offlineAppRemovePrompt=Po odstranitvi teh podatkov %S ne bo na voljo brez povezave.  Ali ste prepričani, da želite odstraniti to stran za delo brez povezave?
+offlineAppRemovePrompt=Po odstranitvi teh podatkov %S ne bo na voljo brez povezave. Ali ste prepričani, da želite odstraniti to stran za delo brez povezave?
 offlineAppRemoveConfirm=Odstrani podatke za delo brez povezave
 
 # LOCALIZATION NOTE: The next string is for the disk usage of the
 # offline application
 #   e.g. offlineAppUsage : "50.23 MB"
 #   %1$S = size (in bytes or megabytes, ...)
 #   %2$S = unit of measure (bytes, KB, MB, ...)
 offlineAppUsage=%1$S %2$S
 
 offlinepermissionstext=Naslednje spletne strani ne smejo shranjevati podatkov za delo brez povezave:
 offlinepermissionstitle=Podatki za delo brez povezave
 
 ####Preferences::Advanced::Network
-#LOCALIZATION NOTE: The next string is for the disk usage of the http cache.
-#   e.g., "Your cache is currently using 200 MB"
+#LOCALIZATION NOTE: The next string is for the disk usage of the web content cache.
+#   e.g., "Your web content cache is currently using 200 MB"
 #   %1$S = size
 #   %2$S = unit (MB, KB, etc.)
-actualCacheSize=Vaš predpomnilnik trenutno zaseda %1$S %2$S prostora na disku
+actualDiskCacheSize=Predpomnilnik vsebine trenutno zaseda %1$S %2$S prostora na disku
 
-stopUsingAccount.title=Ali želite prenehati z uporabo tega računa?
-differentAccount.label=S tem boste ponastavili vse podatke in nastavitve vašega računa za sinhronizacijo.
-differentAccountConfirm.label=Ponastavi vse podatke
+####Preferences::Advanced::Network
+#LOCALIZATION NOTE: The next string is for the disk usage of the application cache.
+#   e.g., "Your application cache is currently using 200 MB"
+#   %1$S = size
+#   %2$S = unit (MB, KB, etc.)
+actualAppCacheSize=Programski predpomnilnik trenutno zaseda %1$S %2$S prostora na disku
+
+syncUnlink.title=Ali želite odklopiti svojo napravo?
+syncUnlink.label=Ta naprava ne bo več povezana z vašim računom za usklajevanje. Vsi vaši osebni podatki, tako na napravi kot na računu za usklajevanje, bodo ostali nedotaknjeni.
+syncUnlinkConfirm.label=Odklopi
--- a/browser/chrome/browser/preferences/privacy.dtd
+++ b/browser/chrome/browser/preferences/privacy.dtd
@@ -1,40 +1,43 @@
-<!ENTITY history.label "Zgodovina">
+<!ENTITY tracking.label                 "Sledenje">
+
+<!ENTITY doNotTrack.label               "Spletnim stranem sporoči, naj mi ne sledijo">
+<!ENTITY doNotTrack.accesskey           "d">
+
+<!ENTITY  history.label "Zgodovina">
 
 <!ENTITY  locationBar.label             "Vrstica z naslovom">
 
 <!ENTITY  locbar.pre.label              "Pri uporabi vrstice z naslovom predlagaj:">
 <!ENTITY  locbar.pre.accessKey          "l">
 <!ENTITY  locbar.post.label             "">
 <!ENTITY  locbar.both.label             "Zgodovino in zaznamke">
 <!ENTITY  locbar.history.label          "Zgodovino">
 <!ENTITY  locbar.bookmarks.label        "Zaznamke">
 <!ENTITY  locbar.nothing.label          "Nič">
 
-
-<!ENTITY acceptCookies.label "Dovoli stranem, da ustvarijo piškote.">
-<!ENTITY acceptCookies.accesskey "p">
+<!ENTITY  acceptCookies.label "Dovoli stranem, da ustvarijo piškote.">
+<!ENTITY  acceptCookies.accesskey "p">
 
-<!ENTITY acceptThirdParty.label "Sprejmi piškote tretjih strani">
-<!ENTITY acceptThirdParty.accesskey "p">
+<!ENTITY  acceptThirdParty.label "Sprejemaj piškote tretjih strani">
+<!ENTITY  acceptThirdParty.accesskey "p">
 
-<!ENTITY keepUntil.label "Obdrži jih:">
-<!ENTITY keepUntil.accesskey "O">
+<!ENTITY  keepUntil.label "Obdrži jih:">
+<!ENTITY  keepUntil.accesskey "O">
 
-<!ENTITY expire.label "dokler ne pretečejo">
-<!ENTITY close.label "dokler ne zaprem &brandShortName;a">
-<!ENTITY askEachTime.label "vsakokrat me vprašaj">
+<!ENTITY  expire.label "dokler ne pretečejo">
+<!ENTITY  close.label "dokler ne zaprem &brandShortName;a">
+<!ENTITY  askEachTime.label "vsakokrat me vprašaj">
 
-<!ENTITY cookieExceptions.label "Izjeme ...">
-<!ENTITY cookieExceptions.accesskey "Z">
+<!ENTITY  cookieExceptions.label "Izjeme ...">
+<!ENTITY  cookieExceptions.accesskey "Z">
 
-<!ENTITY showCookies.label "Pokaži piškote ...">
-<!ENTITY showCookies.accesskey "K">
-
+<!ENTITY  showCookies.label "Pokaži piškote ...">
+<!ENTITY  showCookies.accesskey "K">
 
 <!ENTITY  historyHeader.pre.label          "&brandShortName; naj:">
 <!ENTITY  historyHeader.pre.accesskey      "F">
 <!ENTITY  historyHeader.remember.label     "Shranjuje zgodovino">
 <!ENTITY  historyHeader.dontremember.label "Ne shranjuje zgodovine">
 <!ENTITY  historyHeader.custom.label       "Uporablja posebne nastavitve za zgodovino">
 <!ENTITY  historyHeader.post.label         "">
 
@@ -52,24 +55,21 @@
 <!ENTITY  dontrememberDescription.label  "&brandShortName; bo uporabljal enake nastavitve kot pri zasebnem brskanju in med brskanjem ne bo hranil nobene zgodovine.">
 
 <!-- LOCALIZATION NOTE (dontrememberActions.pre.label): include a trailing space as needed -->
 <!-- LOCALIZATION NOTE (dontrememberActions.post.label): include a starting space as needed -->
 <!ENTITY  dontrememberActions.pre.label          "Morda želite ">
 <!ENTITY  dontrememberActions.clearHistory.label "počistiti vso trenutno zgodovino">
 <!ENTITY  dontrememberActions.post.label         ".">
 
-<!ENTITY  privateBrowsingPermanent.label "Stalno zasebno brskanje">
-<!ENTITY  privateBrowsingPermanent.accesskey "S">
+<!ENTITY  privateBrowsingPermanent2.label "Vedno uporabljaj zasebno brskanje">
+<!ENTITY  privateBrowsingPermanent2.accesskey "S">
 
-<!ENTITY  rememberHistory.label      "Shranjuj zgodovino brskanja">
-<!ENTITY  rememberHistory.accesskey  "b">
-
-<!ENTITY  rememberDownload.label         "Shranjuj zgodovino prenosov">
-<!ENTITY  rememberDownload.accesskey     "p">
+<!ENTITY  rememberHistory2.label      "Shranjuj zgodovino brskanja in prenosov">
+<!ENTITY  rememberHistory2.accesskey  "b">
 
 <!ENTITY  rememberSearchForm.label       "Shranjuj zgodovino iskanja in obrazcev">
 <!ENTITY  rememberSearchForm.accesskey   "i">
 
 <!ENTITY  clearOnClose.label             "Počisti zgodovino ob izhodu iz programa &brandShortName;">
 <!ENTITY  clearOnClose.accesskey         "i">
 
 <!ENTITY  clearOnCloseSettings.label     "Nastavitve …">
--- a/browser/chrome/browser/preferences/security.dtd
+++ b/browser/chrome/browser/preferences/security.dtd
@@ -1,35 +1,35 @@
-<!ENTITY warnAddonInstall.label "Opozori me, ko strani poskusijo namestiti razširitve in teme">
+<!ENTITY warnAddonInstall.label "Opozori me, kadar bodo strani poskušale namestiti dodatke">
 <!ENTITY warnAddonInstall.accesskey "O">
 
 <!-- LOCALIZATION NOTE (tellMaybeForgery.label, tellMaybeAttackSite.label):
   The methods by which forged (phished) and attack sites will be detected by
   phishing providers will vary from human review to machine-based heuristics to a
   combination of both, so it's important that these strings and
   useDownloadedList.label convey the meaning "suspected" (and not something like
   "known").
 -->
 
 <!ENTITY  blockAttackSites.label     "Zavrni sporočene napadalne strani">
 <!ENTITY  blockAttackSites.accesskey "v">
 
 <!ENTITY  blockWebForgeries.label     "Zavrni sporočene spletne prevare">
 <!ENTITY  blockWebForgeries.accesskey "S">
 
-<!ENTITY addonExceptions.label "Izjeme ...">
+<!ENTITY addonExceptions.label "Izjeme …">
 <!ENTITY addonExceptions.accesskey "E">
 
 
 <!ENTITY passwords.label "Gesla">
 
 <!ENTITY rememberPasswords.label "Zapomni si gesla">
 <!ENTITY rememberPasswords.accesskey "Z">
-<!ENTITY passwordExceptions.label "Izjeme ...">
+<!ENTITY passwordExceptions.label "Izjeme …">
 <!ENTITY passwordExceptions.accesskey "i">
 
 <!ENTITY useMasterPassword.label "Uporabi glavno geslo">
 <!ENTITY useMasterPassword.accesskey "U">
-<!ENTITY changeMasterPassword.label "Nastavi glavno geslo ...">
+<!ENTITY changeMasterPassword.label "Nastavi glavno geslo …">
 <!ENTITY changeMasterPassword.accesskey "G">
 
-<!ENTITY savedPasswords.label "Shranjena gesla...">
+<!ENTITY savedPasswords.label "Shranjena gesla …">
 <!ENTITY savedPasswords.accesskey "G">
--- a/browser/chrome/browser/preferences/sync.dtd
+++ b/browser/chrome/browser/preferences/sync.dtd
@@ -1,40 +1,43 @@
 <!-- The page shown when not logged in... -->
 <!ENTITY setupButton.label          "Nastavi storitev &syncBrand.fullName.label;">
 <!ENTITY setupButton.accesskey      "s">
-<!ENTITY weaveDesc.label            "&syncBrand.fullName.label; omogoča dostop do zgodovine, zaznamkov, gesel in odprtih zavihkov vseh vaših naprav.">
+<!ENTITY weaveDesc.label            "&syncBrand.fullName.label; omogoča dostop do zgodovine, zaznamkov, gesel in odprtih zavihkov na vseh vaših napravah.">
 
 <!-- The page shown when logged in... -->
 
 <!-- Login error feedback -->
 <!ENTITY updatePass.label             "Posodobi">
 <!ENTITY resetPass.label              "Ponastavi">
 
 <!-- Manage Account -->
 <!ENTITY manageAccount.label          "Upravljanje računa">
 <!ENTITY manageAccount.accesskey      "a">
 <!ENTITY viewQuota.label              "Prikaži omejitve">
-<!ENTITY changePassword.label         "Spremeni geslo">
-<!ENTITY mySyncKey.label              "Moj sinhronizacijski ključ">
-<!ENTITY resetSync.label              "Ponastavi sinhronizacijo">
-<!ENTITY addDevice.label              "Dodaj napravo">
+<!ENTITY changePassword2.label        "Spremeni geslo …">
+<!ENTITY myRecoveryKey.label          "Moj obnovitveni ključ">
+<!ENTITY resetSync2.label             "Ponastavi usklajevanje …">
 
-<!ENTITY syncMy.label               "Sinhroniziraj">
+<!ENTITY pairDevice.label              "Dodaj napravo">
+
+<!ENTITY syncMy.label               "Uskladi">
 <!ENTITY engine.bookmarks.label     "Zaznamke">
 <!ENTITY engine.bookmarks.accesskey "m">
 <!ENTITY engine.tabs.label          "Zavihke">
 <!ENTITY engine.tabs.accesskey      "Z">
 <!ENTITY engine.history.label       "Zgodovino">
 <!ENTITY engine.history.accesskey   "d">
 <!ENTITY engine.passwords.label     "Gesla">
 <!ENTITY engine.passwords.accesskey "G">
 <!ENTITY engine.prefs.label         "Nastavitve">
 <!ENTITY engine.prefs.accesskey     "N">
+<!ENTITY engine.addons.label        "Dodatki">
+<!ENTITY engine.addons.accesskey    "A">
 
 <!-- Device Settings -->
 <!ENTITY syncComputerName.label       "Ime računalnika:">
 <!ENTITY syncComputerName.accesskey   "r">
-<!ENTITY deactivateDevice.label       "Onemogoči napravo">
+<!ENTITY unlinkDevice.label           "Odklopi napravo">
 
 <!-- Footer stuff -->
 <!ENTITY prefs.tosLink.label        "Pogoji uporabe">
 <!ENTITY prefs.ppLink.label         "Politika zasebnosti">
--- a/browser/chrome/browser/quitDialog.properties
+++ b/browser/chrome/browser/quitDialog.properties
@@ -1,10 +1,10 @@
 quitDialogTitle=Zapri %S
-restartDialogTitle=Ponovno zaženi %S
+restartDialogTitle=Zaženi znova %S
 
 quitTitle=&Izhod
 restartTitle=&Ponovni zagon
 cancelTitle=Prekliči
 saveTitle=&Shrani in zapri
 neverAsk=Ne sprašuj več
 message=Ali želite, da %S shrani vaše zavihke in okna za naslednji zagon?
 messageNoWindows=Ali želite, da %S shrani vaše zavihke za naslednji zagon?
--- a/browser/chrome/browser/safeMode.dtd
+++ b/browser/chrome/browser/safeMode.dtd
@@ -34,26 +34,29 @@
    - the terms of any one of the MPL, the GPL or the LGPL.
    -
 #endif
    - ***** END LICENSE BLOCK ***** -->
 
 <!ENTITY safeModeDialog.title "Varni način &brandShortName;">
 <!ENTITY window.width "39em">
 
-<!ENTITY safeModeDescription.label "&brandShortName; teče v varnem načinu, kar začasno onemogoči vaše nastavitve, teme in razširitve.">
-<!ENTITY safeModeDescription2.label "Spodaj označite, če želite, da bodo naslednje spremembe dokončne:">
+<!ENTITY autoSafeModeIntro.label      "&brandShortName; se je med zagonom nepričakovano sesul">
+<!ENTITY autoSafeModeDescription.label "Opravičujemo se za nevšečnosti. &brandShortName; zdaj teče v varnem načinu, kar začasno onemogoči vaše nastavitve, teme in razširitve.">
 
-<!ENTITY disableAddons.label "onemogoči teme in razširitve">
+<!ENTITY safeModeDescription.label "&brandShortName; zdaj teče v varnem načinu, kar začasno onemogoči vaše nastavitve, teme in razširitve.">
+<!ENTITY safeModeDescription2.label "Označite, katere spremembe želite narediti trajne:">
+
+<!ENTITY disableAddons.label "onemogoči vse dodatke">
 <!ENTITY disableAddons.accesskey "O">
 
 <!ENTITY resetToolbars.label "ponastavi orodne vrstice">
 <!ENTITY resetToolbars.accesskey "P">
 
-<!ENTITY deleteBookmarks.label        "Zbriši vse zaznamke, razen varnostnih kopij">
+<!ENTITY deleteBookmarks.label        "zbriši vse zaznamke, razen varnostnih kopij">
 <!ENTITY deleteBookmarks.accesskey    "v">
 
 <!ENTITY resetUserPrefs.label "ponastavi vse uporabniške nastavitve na privzete vrednosti">
 <!ENTITY resetUserPrefs.accesskey "n">
 
 <!ENTITY restoreSearch.label "ponastavi privzete iskalnike">
 <!ENTITY restoreSearch.accesskey "i">
 
--- a/browser/chrome/browser/setDesktopBackground.dtd
+++ b/browser/chrome/browser/setDesktopBackground.dtd
@@ -1,9 +1,11 @@
 <!ENTITY position.label "Položaj:">
 <!ENTITY tile.label "Porazdeli">
 <!ENTITY center.label "Sredina">
 <!ENTITY stretch.label "Raztegni">
+<!ENTITY fill.label "Zapolni">
+<!ENTITY fit.label "Prilagodi">
 <!ENTITY preview.label "Predogled">
 <!ENTITY color.label "Barva:">
 <!ENTITY setDesktopBackground.title "Nastavi ozadje namizja">
 <!ENTITY openDesktopPrefs.label "Odpri nastavitve namizja">
 <!ENTITY closeWindow.key "w">
--- a/browser/chrome/browser/syncBrand.dtd
+++ b/browser/chrome/browser/syncBrand.dtd
@@ -1,2 +1,2 @@
-<!ENTITY syncBrand.shortName.label  "Sinhronizacija">
-<!ENTITY syncBrand.fullName.label   "Sinhronizacija za Firefox">
+<!ENTITY syncBrand.shortName.label  "Usklajevanje">
+<!ENTITY syncBrand.fullName.label   "Usklajevanje za Firefox">
--- a/browser/chrome/browser/syncGenericChange.properties
+++ b/browser/chrome/browser/syncGenericChange.properties
@@ -1,34 +1,33 @@
 # LOCALIZATION NOTE (change.password.title): This (and associated change.password/passphrase) are used when the user elects to change their password.
-change.password.title = Spremenite vaše geslo
+change.password.title = Spremenite svoje geslo
 change.password.acceptButton = Spremeni geslo
 change.password.status.active = Spreminjanje vašega gesla …
 change.password.status.success = Vaše geslo je bilo spremenjeno.
 change.password.status.error = Pri spreminjanju vašega gesla je prišlo do napake.
 
-change.password2.introText = Vaše geslo mora biti dolgo vsaj 8 znakov.  Razlikovati se mora od uporabniškega imena in sinhronizacijskega ključa.
-change.password.warningText = Opozorilo: Potem ko spremenite geslo, se vaše ostale naprave ne bodo mogle povezati na vaš račun.
+change.password3.introText = Vaše geslo mora biti dolgo vsaj 8 znakov. Razlikovati se mora od uporabniškega imena in obnovitvenega ključa.
+change.password.warningText = Opozorilo: potem ko spremenite geslo, se vaše ostale naprave ne bodo mogle povezati na vaš račun.
 
-change.synckey.acceptButton = Spremeni sinhronizacijski ključ
-change.synckey.label = Spreminjanje sinhronizacijskega ključa in nalaganje lokalnih podatkov. Prosim, počakajte …
-change.synckey2.error = Pri spreminjanju sinhronizacijskega ključa je prišlo do napake!
-change.synckey2.success = Vaš sinhronizacijski ključ je bil uspešno spremenjen!
+change.recoverykey.title = Moj usklajevalni ključ
+change.recoverykey.acceptButton = Spremeni obnovitveni ključ
+change.recoverykey.label = Spreminjanje obnovitvenega ključa in nalaganje krajevnih podatkov. Prosim, počakajte …
+change.recoverykey.error = Pri spreminjanju obnovitvenega ključa je prišlo do napake!
+change.recoverykey.success = Vaš obnovitveni ključ je bil uspešno spremenjen!
 
-change.synckey.introText = Firefox spoštuje vašo zasebnost
 change.synckey.introText2 = Za zagotovitev najvišje stopnje zasebnosti se vsi vaši podatki pred prenosom šifrirajo, ključ za dešifriranje pa se ne prenaša.
 # LOCALIZATION NOTE (change.synckey2.warningText) "Sync" should match &syncBrand.shortName.label; from syncBrand.dtd
-change.synckey2.warningText = Opozorilo: s to spremembo bodo iz strežnika za sinhronizacijo odstranjeni vsi podatki in naloženi novi, zavarovani s tem ključem. Ostalih naprav ne boste mogli sinhronizirati, dokler jim ne nastavite novega sinhronizacijekga ključa.
+change.recoverykey.warningText = Opozorilo: s to spremembo bodo iz strežnika za usklajevanje odstranjeni vsi podatki in naloženi novi, zavarovani s tem ključem. Ostalih naprav ne boste mogli uskladiti, dokler jim ne nastavite novega obnovitvenega ključa.
 
-new.synckey.label = Vaš sinhronizacijski ključ
+new.recoverykey.label = Vaš obnovitveni ključ
 
 # LOCALIZATION NOTE (new.password.title): This (and associated new.password/passphrase) are used on a second computer when it detects that your password or passphrase has been changed on a different device.
 new.password.title            = Posodobite geslo
 new.password.introText        = Strežnik je zavrnil vaše geslo, zato ga morate posodobiti.
-new.password.label            = Vnesite vaše novo geslo
-new.password.confirm          = Potrdite vaše novo geslo
+new.password.label            = Vnesite svoje novo geslo
+new.password.confirm          = Potrdite svoje novo geslo
 new.password.acceptButton     = Posodobi geslo
 new.password.status.incorrect = Napačno geslo. Poskusite znova.
 
-new.synckey.title          = Posodobite sinhronizacijski ključ
-new.synckey2.introText       = Sinhronizacijski ključ je spremenila druga naprava. Vnesite novega.
-new.synckey.acceptButton     = Posodobi sinhronizacijski ključ
-new.synckey.status.incorrect = Sinhronizacijski ključ je napačen. Poskusite znova.
+new.recoverykey.title          = Posodobite obnovitveni ključ
+new.recoverykey.introText      = Obnovitveni ključ je spremenila druga naprava. Vnesite novega.
+new.recoverykey.acceptButton     = Posodobi obnovitveni ključ
--- a/browser/chrome/browser/syncKey.dtd
+++ b/browser/chrome/browser/syncKey.dtd
@@ -1,14 +1,14 @@
 <!ENTITY syncKey.page.title               "&syncBrand.fullName.label;: vaš ključ">
 <!ENTITY syncKey.page.description         "Ta ključ se uporablja za dešifriranje podatkov vašega računa storitve &syncBrand.fullName.label;. Ključ boste morali vnesti vsakič, ko boste nastavljali storitev &syncBrand.fullName.label; na novem računalniku ali napravi.">
 <!ENTITY syncKey.keepItSecret.heading     "Ne izdajte ga nikomur">
-<!ENTITY syncKey.keepItSecret.description "Vaš račun storitve &syncBrand.fullName.label; je šifriran za večjo zaščito vaše zasebnosti. Brez tega ključa so potrebna dolga leta za dešifriranje vaših podatkov. Ste edini lastnik ključa, torej lahko samo vi dostopite do podatkov storitve &syncBrand.fullName.label;.">
+<!ENTITY syncKey.keepItSecret.description "Vaš račun storitve &syncBrand.fullName.label; je šifriran za večjo zaščito vaše zasebnosti. Brez tega ključa so potrebna dolga leta za dešifriranje vaših podatkov. Ste edini lastnik ključa, torej imate dostop do podatkov storitve &syncBrand.fullName.label; samo vi.">
 <!ENTITY syncKey.keepItSafe.heading       "Hranite ga na varnem">
 <!ENTITY syncKey.keepItSafe1.description  "Nikar ne izgubite ključa.">
 <!ENTITY syncKey.keepItSafe2.description  " Kopije vašega ključa ne shranjujemo (to ne bi bilo varno!), ">
 <!ENTITY syncKey.keepItSafe3.description  "zato vam ga ne moremo povrniti,">
 <!ENTITY syncKey.keepItSafe4.description  " če ga izgubite. Ključ boste potrebovali vsakič, ko boste nov računalnik ali napravo želeli povezati z orodjem &syncBrand.fullName.label;.">
 <!ENTITY syncKey.findOutMore1.label       "Več o storitvi &syncBrand.fullName.label; in vaši zasebnosti najdete na ">
 <!ENTITY syncKey.findOutMore2.label       ".">
-<!ENTITY syncKey.footer1.label            "Pogoji uporabe storitve &syncBrand.fullName.label; so na voljo na ">
+<!ENTITY syncKey.footer1.label            "Pogoji za uporabo storitve &syncBrand.fullName.label; so na voljo na ">
 <!ENTITY syncKey.footer2.label            ". Politika zasebnosti je na voljo na ">
 <!ENTITY syncKey.footer3.label            ".">
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/syncProgress.dtd
@@ -0,0 +1,11 @@
+<!ENTITY % brandDTD
+    SYSTEM "chrome://branding/locale/brand.dtd">
+    %brandDTD;
+
+<!-- These strings are used in the sync progress upload page -->
+<!ENTITY syncProgress.pageTitle    "Vaše prvo usklajevanje">
+<!ENTITY syncProgress.textBlurb    "Vaši podatki se zdaj šifrirajo in nalagajo v ozadju. Lahko zaprete zavihek in nadaljujete z uporabo &brandShortName;a.">
+<!ENTITY syncProgress.closeButton  "Zapri">
+<!ENTITY syncProgress.logoAltText  "Logotip &brandShortName;a">
+<!ENTITY syncProgress.diffText     "&brandShortName; se bo odslej samodejno usklajeval v ozadju. Lahko zaprete zavihek in nadaljujete z uporabo &brandShortName;a.">
+
--- a/browser/chrome/browser/syncQuota.properties
+++ b/browser/chrome/browser/syncQuota.properties
@@ -17,20 +17,20 @@ quota.usageNoQuota.label    = Trenutno u
 quota.usagePercentage.label = Uporabljate %1$S%% (%2$S %3$S) od dovoljenih %4$S %5$S.
 quota.usageError.label      = Pridobivanje podatkov o omejitvah ni uspelo.
 quota.retrieving.label      = Pridobivanje …
 # LOCALIZATION NOTE (quota.sizeValueUnit.label): %1$S is the amount of space
 # occupied by the engine, %2$K the corresponding unit (e.g. kB) as defined in
 # the download manager.
 quota.sizeValueUnit.label   = %1$S %2$S
 quota.remove.label          = Odstrani
-quota.treeCaption.label     = Odstranite izbire za prenehanje sinhronizacije in sprostitev prostora na strežniku.
+quota.treeCaption.label     = Odstranite izbire za prenehanje usklajevanja in sprostitev prostora na strežniku.
 # LOCALIZATION NOTE (quota.removal.label): %S is a list of engines that will be
 # disabled and whose data will be removed once the user confirms.
-quota.removal.label         = Sinhronizacija za Firefox bo odstranila naslednje podatke: %S.
+quota.removal.label         = Usklajevanje za Firefox bo odstranila naslednje podatke: %S.
 # LOCALIZATION NOTE (quota.list.separator): This is the separator string used
 # for the list of engines (incl. spaces where appropriate)
 quota.list.separator        = ,\u0020
 # LOCALIZATION NOTE (quota.freeup.label): %1$S and %2$S are numeric value
 # and unit (as defined in the download manager) of the amount of space freed
 # up by disabling the unchecked engines.  If displayed this string is
 # concatenated directly to quota.removal.label and may need to start off with
 # whitespace.
--- a/browser/chrome/browser/syncSetup.dtd
+++ b/browser/chrome/browser/syncSetup.dtd
@@ -1,107 +1,109 @@
-<!ENTITY accountSetupTitle.label    "&syncBrand.fullName.label;: Namestitev">
+<!ENTITY accountSetupTitle.label    "&syncBrand.fullName.label;: namestitev">
 
 <!-- First page of the wizard -->
 
-<!ENTITY setup.pickSetupType.description "Pozdravljeni! Če še niste uporabljali storitve &syncBrand.fullName.label;, najprej ustvarite račun.">
+<!ENTITY setup.pickSetupType.description2 "Pozdravljeni! Če še niste uporabljali storitve &syncBrand.fullName.label;, morate najprej ustvariti račun.">
 <!ENTITY button.createNewAccount.label "Ustvari nov račun">
-<!ENTITY setup.haveAccount.label "Imam račun storitve &syncBrand.fullName.label;.">
-<!ENTITY button.connect.label    "Poveži">
+<!ENTITY button.haveAccount.label      "Imam račun">
 
 <!ENTITY setup.choicePage.title.label     "Ali ste že kdaj prej uporabljali storitev &syncBrand.fullName.label;?">
 <!ENTITY setup.choicePage.new.label       "Nikoli prej nisem uporabljal storitve &syncBrand.shortName.label;">
 <!ENTITY setup.choicePage.existing.label  "Storitev &syncBrand.shortName.label; že uporabljam na drugem računalniku">
 
 <!-- New Account AND Existing Account -->
 <!ENTITY server.label               "Strežnik">
-<!ENTITY serverType.main.label      "Strežnik stortive &syncBrand.fullName.label;">
+<!ENTITY serverType.default.label   "Privzet strežnik Mozille: &syncBrand.fullName.label;">
 <!ENTITY serverType.custom2.label   "Uporabi strežnik po meri …">
 <!ENTITY signIn.account2.label      "Račun">
 <!ENTITY signIn.account2.accesskey  "R">
 <!ENTITY signIn.password.label      "Geslo">
 <!ENTITY signIn.password.accesskey  "G">
-<!ENTITY signIn.syncKey.label       "Sinhronizacijski ključ">
-<!ENTITY signIn.syncKey.accesskey   "K">
+<!ENTITY signIn.recoveryKey.label       "Obnovitveni ključ">
+<!ENTITY signIn.recoveryKey.accesskey   "K">
 
 <!-- New Account Page 1: Basic Account Info -->
 <!ENTITY setup.newAccountDetailsPage.title.label "Podrobnosti računa">
-<!ENTITY setup.confirmPassword.label  "Potrdi geslo">
-<!ENTITY setup.confirmPassword.accesskey  "t">
 <!ENTITY setup.emailAddress.label     "Elektronska pošta">
 <!ENTITY setup.emailAddress.accesskey "E">
+<!ENTITY setup.choosePassword.label      "Izberite geslo">
+<!ENTITY setup.choosePassword.accesskey  "I">
+<!ENTITY setup.confirmPassword.label  "Potrdite geslo">
+<!ENTITY setup.confirmPassword.accesskey  "t">
 <!-- LOCALIZATION NOTE: tosAgree1, tosLink, tosAgree2, ppLink, tosAgree3 are
      joined with implicit white space, so spaces in the strings aren't necessary -->
 <!ENTITY setup.tosAgree1.label      "Soglašam s">
 <!ENTITY setup.tosAgree1.accesskey  "a">
 <!ENTITY setup.tosLink.label        "pogoji uporabe">
 <!ENTITY setup.tosAgree2.label      "in">
 <!ENTITY setup.ppLink.label         "politiko zasebnosti">
 <!ENTITY setup.tosAgree3.label      "">
 <!ENTITY setup.tosAgree2.accesskey  "">
 
-<!-- New Account Page 2: Sync Key -->
-<!ENTITY setup.newSyncKeyPage.title.label "&brandShortName; spoštuje vašo zasebnost">
-<!ENTITY setup.newSyncKeyPage.description.label "Za zagotovitev najvišje stopnje zasebnosti se vsi vaši podatki pred prenosom šifrirajo. Sinhronizacijski ključ, ki je potreben za dešifriranje, pa se ne prenaša.">
-<!ENTITY syncKeyEntry.label        "Vaš sinhronizacijski ključ">
-<!ENTITY syncKeyEntry.accesskey    "K">
-<!ENTITY syncKeyBackup.description "Sinhronizacijski ključ je potreben za dostop do storitve &syncBrand.fullName.label; na drugih napravah. Ustvarite varnostno kopijo, saj vam ga ne moremo obnoviti.">
+<!-- My Recovery Key dialog -->
+<!ENTITY setup.newRecoveryKeyPage.title.label "&brandShortName; spoštuje vašo zasebnost">
+<!ENTITY setup.newRecoveryKeyPage.description.label "Za zagotovitev najvišje stopnje zasebnosti se vsi vaši podatki pred prenosom šifrirajo. Obnovitveni ključ, ki je potreben za dešifriranje, pa se ne prenaša.">
+<!ENTITY recoveryKeyEntry.label        "Vaš obnovitveni ključ">
+<!ENTITY recoveryKeyEntry.accesskey    "K">
+<!ENTITY syncGenerateNewKey.label  "Ustvari nov ključ">
+<!ENTITY recoveryKeyBackup.description "Obnovitveni ključ potrebujete za dostop do storitve &syncBrand.fullName.label; na drugih napravah. Ustvarite varnostno kopijo, saj vam ga ne moremo obnoviti.">
 
 <!ENTITY button.syncKeyBackup.print.label     "Natisni …">
 <!ENTITY button.syncKeyBackup.print.accesskey "N">
 <!ENTITY button.syncKeyBackup.save.label      "Shrani …">
 <!ENTITY button.syncKeyBackup.save.accesskey  "S">
 
-<!-- New Account Page 3: Captcha -->
-<!ENTITY setup.captchaPage2.title.label     "Potrdite, da niste robot">
 <!-- Existing Account Page 1: Add Device (incl. Add a Device dialog strings) -->
-<!ENTITY addDevice.title.label              "Dodaj napravo">
+<!ENTITY pairDevice.title.label             "Dodaj napravo">
 <!ENTITY addDevice.showMeHow.label          "Prikaži, kako.">
 <!ENTITY addDevice.dontHaveDevice.label     "Naprave nimam pri sebi">
-<!ENTITY addDevice.setup.description.label  "Za vklop v nastavitvah storitve &syncBrand.shortName.label; vaše druge naprave izberite &#x0022;Dodaj napravo&#x0022;.">
+<!ENTITY pairDevice.setup.description.label "Za vklop izberite &#x0022;Dodaj napravo&#x0022; na vaši drugi napravi.">
 <!ENTITY addDevice.setup.enterCode.label    "Nato vnesite to kodo:">
-<!ENTITY addDevice.dialog.description.label "Za vklop vaše nove naprave v njenih nastavitvah storitve &syncBrand.shortName.label; izberite &#x0022;Poveži.&#x0022;">
+<!ENTITY pairDevice.dialog.description.label "Za vklop vaše nove naprave na njej izberite &#x0022;Nastavi usklajevanje&#x0022;.">
 <!ENTITY addDevice.dialog.enterCode.label   "Vnesite kodo, ki jo ponuja naprava:">
-<!ENTITY addDevice.dialog.tryAgain.label    "Poskusite ponovno.">
-<!ENTITY addDevice.dialog.successful.label  "Naprava je bila dodana uspešno. Začetna sinhronizacija lahko traja nekaj minut in se bo končala v ozadju.">
-<!ENTITY addDevice.dialog.syncKey.label     "Za vklop vaše naprave boste morali vnesti svoj sinhronizacijski ključ. Natisnite ga ali shranite in ga imejte pri sebi.">
+<!ENTITY addDevice.dialog.tryAgain.label    "Poskusite znova.">
+<!ENTITY addDevice.dialog.successful.label  "Naprava je bila dodana uspešno. Začetno usklajevanje lahko traja nekaj minut in se bo končala v ozadju.">
+<!ENTITY addDevice.dialog.recoveryKey.label     "Za vklop vaše naprave boste morali vnesti svoj obnovitveni ključ. Natisnite ga ali shranite in ga imejte pri sebi.">
 <!ENTITY addDevice.dialog.connected.label   "Naprava je povezana">
 
 <!-- Existing Account Page 2: Manual Login -->
 <!ENTITY setup.signInPage.title.label "Prijava">
-<!ENTITY existingSyncKey.description "Kopijo sinhronizacijskega ključa lahko najdete v nastavitvah storitve &syncBrand.shortName.label; vaše druge naprave. Izberite &#x0022;Upravljanje računa&#x0022; in nato &#x0022;Moj sinhronizacijski ključ&#x0022;.">
+<!ENTITY existingRecoveryKey.description "Kopijo obnovitvenega ključa lahko najdete v nastavitvah storitve &syncBrand.shortName.label; vaše druge naprave. Izberite &#x0022;Upravljanje računa&#x0022; in nato &#x0022;Moj obnovitveni ključ&#x0022;.">
 <!ENTITY verifying.label              "Preverjanje …">
 <!ENTITY resetPassword.label          "Ponastavi geslo">
 <!ENTITY resetSyncKey.label           "Izgubil sem drugo napravo.">
 
 <!-- Sync Options -->
-<!ENTITY setup.optionsPage.title      "Možnosti sinhronizacije">
+<!ENTITY setup.optionsPage.title      "Možnosti usklajevanja">
 <!ENTITY syncComputerName.label       "Ime računalnika:">
 <!ENTITY syncComputerName.accesskey   "r">
 
-<!ENTITY syncMy.label               "Sinhroniziraj">
+<!ENTITY syncMy.label               "Usklajuj:">
 <!ENTITY engine.bookmarks.label     "Zaznamke">
 <!ENTITY engine.bookmarks.accesskey "m">
 <!ENTITY engine.tabs.label          "Zavihke">
 <!ENTITY engine.tabs.accesskey      "Z">
 <!ENTITY engine.history.label       "Zgodovino">
 <!ENTITY engine.history.accesskey   "d">
 <!ENTITY engine.passwords.label     "Gesla">
 <!ENTITY engine.passwords.accesskey "G">
 <!ENTITY engine.prefs.label         "Nastavitve">
 <!ENTITY engine.prefs.accesskey     "N">
+<!ENTITY engine.addons.label        "Dodatke">
+<!ENTITY engine.addons.accesskey    "A">
 
 <!ENTITY choice2.merge.main.label      "Združi podatke tega računalnika in storitve &syncBrand.shortName.label;">
 <!ENTITY choice2.merge.recommended.label "Priporočeno:">
 <!ENTITY choice2.client.main.label     "Zamenjaj podatke tega računalnika s podatki storitve &syncBrand.shortName.label;">
 <!ENTITY choice2.server.main.label     "Zamenjaj podatke ostalih naprav s podatki tega računalnika">
 
 <!-- Confirm Merge Options -->
 <!ENTITY setup.optionsConfirmPage.title "Potrditev">
 <!ENTITY confirm.merge.label          "Izbrali ste združitev vaših podatkov na tem računalniku s podatki na drugih napravah, ki uporabljajo storitev &syncBrand.fullName.label;.">
 <!ENTITY confirm.client2.label         "Opozorilo: naslednji podatki brskalnika &brandShortName; na tem računalniku bodo odstranjeni:">
 <!ENTITY confirm.client.moreinfo.label "&brandShortName; bo potem skopiral vaše podatke iz storitve &syncBrand.fullName.label; na ta računalnik.">
-<!ENTITY confirm.server2.label         "Opozorilo: podatki na naslednjih napravah bodo prepisani z lokalnimi:">
+<!ENTITY confirm.server2.label         "Opozorilo: podatki na naslednjih napravah bodo prepisani z krajevnimi:">
 
 <!-- New & Existing Account: Setup Complete -->
 <!ENTITY setup.successPage.title  "Namestitev končana!">
-<!ENTITY changeOptions.label "To nastavitev lahko spremenite z izbiro Možnosti sinhronizacije.">
+<!ENTITY changeOptions.label "To nastavitev lahko spremenite z izbiro Možnosti usklajevanja.">
 <!ENTITY continueUsing.label "Zdaj lahko nadaljujete z uporabo &brandShortName;a.">
--- a/browser/chrome/browser/syncSetup.properties
+++ b/browser/chrome/browser/syncSetup.properties
@@ -1,9 +1,9 @@
-button.syncOptions.label       = Možnosti sinhronizacije
+button.syncOptions.label       = Možnosti usklajevanja
 button.syncOptionsDone.label   = Končaj
 button.syncOptionsCancel.label = Prekliči
 
 invalidEmail.label          = Neveljavna elektronska pošta
 serverInvalid.label         = Vnesite veljaven URL strežnika
 usernameNotAvailable.label  = Že v uporabi
 
 verifying.label = Preverjanje …
@@ -24,19 +24,20 @@ bookmarksCount.label        = #1 zaznamek;več zaznamkov (#1)
 # #1 is the number of days (was %S for a short while, use #1 instead, even if both work)
 historyDaysCount.label      = #1 dan zgodovine;več dni zgodovine (#1)
 # LOCALIZATION NOTE (passwordsCount.label):
 # Semi-colon list of plural forms. See:
 # http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # #1 is the number of passwords (was %S for a short while, use #1 instead, even if both work)
 passwordsCount.label        = #1 geslo;več gesel (#1)
 
-save.synckey.title = Shrani sinhronizacijski ključ
+save.recoverykey.title = Shrani obnovitveni ključ
+save.recoverykey.defaultfilename = Firefoxov obvnovitveni kljuc.html
 
-newAccount.action.label = Sinhronizacija za Firefox je zdaj pripravljena za samodejno sinhronizacijo podatkov brskalnika.
-newAccount.change.label = Kaj natančno želite sinhronizirati, lahko izberete v Možnostih sinhronizacije.
-resetClient.change.label = Sinhronizacija za Firefox bo zdaj združila vse podatke brskalnika na tem računalniku s podatki na vašem računu.
-wipeClient.change.label = Sinhronizacija za Firefox bo zdaj zamenjala vse podatke brskalnika na tem računalniku s podatki na vašem računu.
-wipeRemote.change.label = Sinhronizacija za Firefox bo zdaj zamenjala vse podatke brskalnika na vašem računu s podatki na tem računalniku.
-existingAccount.change.label = To nastavitev lahko spremenite z izbiro Možnosti sinhronizacije.
+newAccount.action.label = Usklajevanje za Firefox je zdaj pripravljeno za samodejno usklajevanje podatkov brskalnika.
+newAccount.change.label = Kaj natančno želite uskladiti, lahko izberete v Možnostih usklajevanja.
+resetClient.change.label = Usklajevanje za Firefox bo zdaj vse podatke brskalnika na tem računalniku združilo s podatki na vašem računu.
+wipeClient.change.label = Usklajevanje za Firefox bo zdaj vse podatke brskalnika na tem računalniku zamenjalo s podatki na vašem računu.
+wipeRemote.change.label = Usklajevanje za Firefox bo zdaj vse podatke brskalnika na vašem računu zamenjalo s podatki na tem računalniku.
+existingAccount.change.label = To nastavitev lahko spremenite z izbiro Možnosti usklajevanja.
 
 # Several other strings are used (via Weave.Status.login), but they come from
 #  /services/sync */
--- a/browser/chrome/browser/tabview.properties
+++ b/browser/chrome/browser/tabview.properties
@@ -1,4 +1,8 @@
-tabview.groupItem.newTabButton=Nov zavihek
+tabview.button.searchTabs=Iskanje po skupinah zavihkov
+tabview.button.exitTabGroups=Izhod iz skupin zavihkov
 tabview.groupItem.defaultName=Poimenuj skupino zavihkov …
+tabview.groupItem.closeGroup=Zapri skupino
 tabview.groupItem.undoCloseGroup=Razveljavi zapiranje skupine
+tabview.groupItem.discardClosedGroup=Zavrzi zaprto skupino
 tabview.search.otherWindowTabs=Zavihki drugih oken
+tabview.notification.sessionStore=Zavihki in skupine se bodo samodejno obnovili ob naslednjem zagonu %Sa.
--- a/browser/chrome/overrides/appstrings.properties
+++ b/browser/chrome/overrides/appstrings.properties
@@ -42,24 +42,27 @@ connectionFailure=Pri vzpostavljanju pov
 netInterrupt=Povezava s stranjo %S se je nepričakovano uničila. Nekaj podatkov pa se je morda vendarle preneslo.
 netTimeout=Časovna omejitev za vzpostavitev povezave s stranjo %S je potekla.
 redirectLoop=Ta naslov preusmerja zahtevo tako, da se zahteva nikdar ne bi izpolnila.
 ## LOCALIZATION NOTE (confirmRepostPrompt): In this item, don't translate "%S"
 confirmRepostPrompt=Za prikaz te strani mora %S poslati podatke, ki bodo ponovili vsa predhodno izvedena dejanja (npr. iskanje ali potrdilo naročila).
 resendButton.label=Ponovno pošlji
 unknownSocketType=Firefox ne ve, kako se povezati na ta strežnik.
 netReset=Povezava s strežnikom je bila prekinjena med nalaganjem.
+notCached=Ta dokument ni več na voljo.
 netOffline=Tega dokumenta ne morem prikazati, ko ste brez povezave
 isprinting=Dokumenta ne morete spremeniti, ko se tiska ali pa ste v predogledu tiskanja.
 deniedPortAccess=Dostop do teh vrat je onemogočen zaradi varnostnih razlogov.
 proxyResolveFailure= Posrednika, ki ste ga navedli, ni mogoče najti.
 proxyConnectFailure=Povezava do posrednika, ki ste ga nastavili, je bila zavrnjena.
 contentEncodingError=Strani, ki si jo želite ogledati, ni mogoče prikazati, ker uporablja neveljavno ali nepodprto obliko stiskanja.
 unsafeContentType=Strani, ki si jo želite ogledati, ni mogoče prikazati, ker je vsebovana v vrsti datoteke, ki je morda ni varno odpreti. Obrnite se na lastnike spletne strani in jih obvestite o težavi.
 externalProtocolTitle=Zahteva zunanjega protokola
-externalProtocolPrompt=Za poganjanje povezav %1$S: moram pognati zunanji program.\n\n\nZahtevana povezava:\n\n%2$S\n\nProgram: %3$S\n\n\nV primeru, da te zahteve niste pričakovali, bi to lahko bil napad na pomanjkljivost tega zunanjega programa. V kolikor niste prepričani o nenevarnosti te operacije, prekličite odpiranje.\n
+externalProtocolPrompt=Za poganjanje povezav %1$S moram pognati zunanji program.\n\n\nZahtevana povezava:\n\n%2$S\n\nProgram: %3$S\n\n\nV primeru, da te zahteve niste pričakovali, bi to lahko bil napad na pomanjkljivost tega zunanjega programa. Prekličite ukaz, če niste prepričani, da zahteva ni zlonamerna.\n
 #LOCALIZATION NOTE (externalProtocolUnknown): The following string is shown if the application name can't be determined
 externalProtocolUnknown=<Neznan>
 externalProtocolChkMsg=Mojo odločitev si zapomni za vse povezave te vrste.
 externalProtocolLaunchBtn=Zaženi program
 malwareBlocked=Spletna stran na naslovu %S je bila prijavljena kot napadalna in je zaradi vaših varnostnih nastavitev zavrnjena.
 phishingBlocked=Spletna stran na naslovu %S je bila prijavljena kot spletna prevara, ki želi uporabnike prepričati v izdajo osebnih ali finančnih podatkov.
 cspFrameAncestorBlocked=Varnostna politika vsebine te strani ne omogoča vgradnje v takšni obliki.
+corruptedContentError=Strani, ki si jo želite ogledati, ni mogoče prikazati, ker je bila med prenosom podatkov odkrita napaka.
+remoteXUL=Ta stran uporablja tehnologijo, ki v Firefoxu privzeto ni več podprta.
--- a/browser/chrome/overrides/netError.dtd
+++ b/browser/chrome/overrides/netError.dtd
@@ -47,25 +47,23 @@
   <li>Prepričajte se, da uporabljate poševnico naprej (tj. 
     <strong>/</strong>).</li>
 </ul>
 ">
 
 <!ENTITY netInterrupt.title "Povezava je bila prekinjena">
 <!ENTITY netInterrupt.longDesc "&sharedLongDesc;">
 
+<!ENTITY notCached.title "Dokument je potekel">
+<!ENTITY notCached.longDesc "<p>Zahtevan dokument ni več na voljo v predpomnilniku &brandShortName;a.</p><ul><li>&brandShortName; občutljivih dokumentov iz varnostnih razlogov samodejno ne nalaga ponovno.</li><li>Kliknite poskusi znova za ponovno nalaganje dokumenta s spletne strani.</li></ul>">
+
 <!ENTITY netOffline.title "Nepovezan način">
-<!-- LOCALIZATION NOTE (netOffline.overrideLongDesc) - This string should
-     indicate that "Work Offline" is a menu item without being too specific,
-     since it could be in either the normal menu (Mac/Linux) or the Firefox button
-     menu (Windows).
--->
-<!ENTITY netOffline.overrideLongDesc "
+<!ENTITY netOffline.longDesc2 "
 <ul>
-  <li>Odstranite izbiro &quot;Nepovezan način&quot; v meniju in poskusite znova.</li>
+  <li>Kliknite &quot;Poskusi znova&quot; za preklop v povezan način in ponovno naložite stran.</li>
 </ul>
 ">
 
 <!ENTITY contentEncodingError.title "Napaka pri kodiranju vsebine">
 <!ENTITY contentEncodingError.longDesc "
 <ul>
   <li>O napaki obvestite lastnike spletne strani.</li>
 </ul>
@@ -163,23 +161,30 @@ začasna in lahko poskusite znova pozneje.</li>
 <!ENTITY phishingBlocked.longDesc "
 <p>Vnos osebnih podatkov na tej strani lahko pripelje do kraje identitete ali drugih zlorab.</p>
 <p>Tovrstne spletne prevare se uporabljajo v zlorabah, znanih kot ribarjenje, kjer zlonamerne spletne strani ali elektronska pošta oponašajo vire, ki jim zaupate.</p>
 ">
 
 <!ENTITY cspFrameAncestorBlocked.title "Zavrnjeno zaradi varnostne politike vsebine">
 <!ENTITY cspFrameAncestorBlocked.longDesc "<p>&brandShortName; je preprečil nalaganje strani v takšni obliki, ker tako določa varnostna politika vsebine.</p>">
 
+<!ENTITY corruptedContentError.title "Okvara vsebine">
+<!ENTITY corruptedContentError.longDesc "<p>Strani, ki si jo želite ogledati, ni mogoče prikazati, ker je bila med prenosom podatkov odkrita napaka.</p><ul><li>O napaki obvestite lastnike spletne strani.</li></ul>">
+
+
 <!ENTITY securityOverride.linkText "Lahko pa dodate izjemo...">
 <!ENTITY securityOverride.getMeOutOfHereButton "Odpelji me na domačo stran!">
 <!ENTITY securityOverride.exceptionButtonLabel "Dodaj izjemo...">
 
 <!-- LOCALIZATION NOTE (securityOverride.warningContent) - Do not translate the
 contents of the <button> tags. It uses strings already defined above. The
 button is included here (instead of netError.xhtml) because it exposes
 functionality specific to firefox. -->
 
 <!ENTITY securityOverride.warningContent "
 <p>Ne dodajajte izjeme, če uporabljate povezavo, ki ji ne zaupate popolnoma, ali če od tega strežnika običajno ne prejemate takšnih opozoril.</p> 
  
 <button id='getMeOutOfHereButton'>&securityOverride.getMeOutOfHereButton;</button>
 <button id='exceptionDialogButton'>&securityOverride.exceptionButtonLabel;</button>
 ">
+
+<!ENTITY remoteXUL.title "Oddaljeni XUL">
+<!ENTITY remoteXUL.longDesc "<p><ul><li>O napaki obvestite lastnike spletne strani.</li></ul></p>">
--- a/browser/defines.inc
+++ b/browser/defines.inc
@@ -1,11 +1,9 @@
 #filter emptyLines
 
 #define MOZ_LANGPACK_CREATOR mozilla.org
 
 # If non-English locales wish to credit multiple contributors, uncomment this
-
 # variable definition and use the format specified.
-
 #define MOZ_LANGPACK_CONTRIBUTORS <em:contributor>Aleks Reinhardt</em:contributor> <em:contributor>Matjaž Horvat</em:contributor> <em:contributor>Brian King</em:contributor> <em:contributor>Martin Srebotnjak</em:contributor>
 
 #unfilter emptyLines
--- a/browser/feedback/main.dtd
+++ b/browser/feedback/main.dtd
@@ -7,19 +7,19 @@
 <!ENTITY testpilot.settings.newStudy.label          "Je na voljo nova raziskava">
 <!ENTITY testpilot.settings.hasNewResults.label     "Ima raziskava nove rezultate">
 <!ENTITY testpilot.settings.alwaysSubmitData.label  "Samodejno pošiljaj moje podatke (ne sprašuj)">
 <!ENTITY testpilot.allYourStudies.label             "Vse raziskave uporabnikov …">
 <!ENTITY testpilot.about.label                      "O Test Pilotu">
 
 <!-- all studies window -->
 <!ENTITY testpilot.studiesWindow.title                  "Vaše raziskave za Test Pilota">
-<!ENTITY testpilot.studiesWindow.currentStudies.label   "Trenutne razsikave">
-<!ENTITY testpilot.studiesWindow.finishedStudies.label  "Končane razsikave">
-<!ENTITY testpilot.studiesWindow.studyFindings.label    "Ugotovitve razsikav">
+<!ENTITY testpilot.studiesWindow.currentStudies.label   "Trenutne raziskave">
+<!ENTITY testpilot.studiesWindow.finishedStudies.label  "Končane raziskave">
+<!ENTITY testpilot.studiesWindow.studyFindings.label    "Ugotovitve raziskav">
 <!ENTITY testpilot.studiesWindow.settings.label         "Nastavitve">
 <!ENTITY testpilot.studiesWindow.stillLoadingMessage    "Nalaganje …">
 
 <!-- raw data dialog -->
 <!ENTITY testpilot.rawDataWindow.title                  "Test Pilot: neobdelani podatki">
 
 <!-- notification -->
 <!ENTITY testpilot.notification.close.tooltip            "Zapri">
--- a/browser/feedback/main.properties
+++ b/browser/feedback/main.properties
@@ -9,34 +9,34 @@ testpilot.takeSurvey = Sodeluj v anketi
 
 # Feedback button menu
 testpilot.turnOn = Vključi raziskave uporabnikov
 testpilot.turnOff = Izključi raziskave uporabnikov
 
 # studies window
 testpilot.studiesWindow.noStudies = Trenutno pripravljamo novo raziskavo, ki bo kmalu potrkala na vaša vrata. Potrpite še malo!
 testpilot.studiesWindow.uploading = Nalaganje …
-testpilot.studiesWindow.unableToReachServer = Ni mogoče vzpostaviti zveze z Mozillo. Ponovno poskusite pozneje.
+testpilot.studiesWindow.unableToReachServer = Ni mogoče vzpostaviti zveze z Mozillo. Poskusite znova pozneje.
 testpilot.studiesWindow.thanksForContributing = Hvala za vaš prispevek!
 testpilot.studiesWindow.finishedOn = Končana raziskava: %S
 testpilot.studiesWindow.canceledStudy = (to raziskavo ste preklicali)
 testpilot.studiesWindow.missedStudy = (to raziskavo ste zamudili)
 testpilot.studiesWindow.willStart = Raziskava za sodelovanje %S
 testpilot.studiesWindow.gatheringData = Poteka zbiranje podatkov.
 testpilot.studiesWindow.willFinish = Raziskava za dokončanje: %S
 testpilot.studiesWindow.proposeStudy = Predlagajte svojo raziskavo
 
 # for pages
 testpilot.page.commentsAndDiscussions = Komentarji in razprave »
 testpilot.page.proposeATest = Predlagajte preizkus »
 testpilot.page.testpilotOnTwitter = @MozTestPilot na Twitterju »
 
 # status page
 testpilot.statusPage.uploadingData = Poteka nalaganje podatkov …
-testpilot.statusPage.uploadErrorMsg = Ups! Prišlo je do napake pri vzpostavljenju zveze s srežniki Mozille.  Ste povezani na internet?
+testpilot.statusPage.uploadErrorMsg = Ups! Med vzpostavljanjem zveze s strežniki Mozille je prišlo do napake. Ste povezani na internet?
 testpilot.statusPage.willRetry = Test Pilot bo samodejno poskusil znova, zato lahko zaprete to stran.
 testpilot.statusPage.endedAlready = (Se je že končala in te strani sploh ne bi smeli videti)
 testpilot.statusPage.todayAt =  danes ob %S
 testpilot.statusPage.endOn = dne %S
 # LOCALIZATION NOTE (numExtensions): Semi-colon list of plural forms.
 # See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # #1 = number of extensions
 # example: "2 extensions"
@@ -46,17 +46,17 @@ testpilot.statusPage.askMeBeforeSubmitData = Vprašaj me, ali želim poslati moje podatke.
 testpilot.statusPage.alwaysSubmitData = Vedno pošlji moje podatke in me ne sprašuj.
 testpilot.statusPage.neverSubmitData = Nikoli ne pošiljaj podatkov in me ne sprašuj.
 testpilot.statusPage.loading = Nalaganje …
 
 # quit page
 testpilot.quitPage.aboutToQuit = Dokončali boste raziskavo "%S".
 testpilot.quitPage.optionalMessage = (Neobvezno) Sporočite nam, zakaj sta se odločili prekiniti raziskavo.
 testpilot.quitPage.reason = Razlog:
-testpilot.quitPage.recurringStudy = To je ponavljajoča raziskava. Sporočili vam bomo, kdaj jo bomo znova izvajali.  Če o tem ne želite biti obveščeni, odkljukajte spodnjo izbiro:
+testpilot.quitPage.recurringStudy = To je ponavljajoča raziskava. Sporočili vam bomo, kdaj jo bomo znova izvajali. Če o tem ne želite biti obveščeni, odkljukajte spodnjo izbiro:
 testpilot.quitPage.quitForever = Končaj to ponavljajočo raziskavo.
 testpilot.quitPage.quitStudy = Končaj raziskavo »
 
 # welcome page
 testpilot.welcomePage.thankYou = Hvala, da ste se pridružili ekipi Test Pilota!
 testpilot.welcomePage.gettingStarted = Prvi koraki
 testpilot.welcomePage.pleaseTake = Izpolnite
 testpilot.welcomePage.backgroundSurvey = anketo za pilote
@@ -78,21 +78,21 @@ testpilot.surveyPage.reviewOrChangeYourAnswers = Če želite pregledati ali spremeniti vaše odgovore, lahko to kadarkoli storite s spodnjim gumbom.
 
 # modules/task.js
 testpilot.finishedTask.finishedStudy = Odlično! Dokončali ste raziskavo "%S"!
 testpilot.finishedTask.allRelatedDataDeleted = Vsi podatki, povezani s to raziskavo, so bili odstranjeni z računalnika.
 
 # modules/setup.js
 testpilot.notification.update = Posodobi …
 testpilot.notification.thankYouForUploadingData = Hvala!
-testpilot.notification.thankYouForUploadingData.message = Hvala za nalaganje vaših podatkov.
+testpilot.notification.thankYouForUploadingData.message = Hvala, da ste naložili svoje podatke.
 testpilot.notification.readyToSubmit = Pripravljeno za pošiljanje
 testpilot.notification.readyToSubmit.message = Raziskava Test Pilota "%S" je končala zbiranje podatkov in je pripravljena na pošiljanje.
 testpilot.notification.newTestPilotStudy = Nova raziskava Test Pilota
 testpilot.notification.newTestPilotStudy.pre.message = Raziskava Test Pilota "%S" se bo kmalu začela.
 testpilot.notification.newTestPilotSurvey = Nova anketa Test Pilota
 testpilot.notification.newTestPilotSurvey.message = Anketa Test Pilota "%S" je na voljo.
 testpilot.notification.newTestPilotResults = Novi rezultati Test Pilota
-testpilot.notification.newTestPilotResults.message = Na voljo so novi razultati raziskave Test Pilota "%S".
+testpilot.notification.newTestPilotResults.message = Na voljo so novi rezultati raziskave Test Pilota "%S".
 testpilot.notification.autoUploadedData = Hvala!
 testpilot.notification.autoUploadedData.message = Raziskava Test Pilota "%S" je končana in vaši podatki so poslani!
 testpilot.notification.extensionUpdate = Posodobitev razširitve
-testpilot.notification.extensionUpdate.message = Ena izmed vaših raziskav potrebuje novejšo razičico Test Pilota. Najnovejšo različico lahko najdete v oknu Dodatki.
+testpilot.notification.extensionUpdate.message = Ena izmed vaših raziskav potrebuje novejšo različico Test Pilota. Najnovejšo različico lahko najdete v oknu Dodatki.
--- a/browser/installer/custom.properties
+++ b/browser/installer/custom.properties
@@ -52,16 +52,20 @@
 
 REG_APP_DESC=$BrandShortName prinaša varno, enostavno brskanje po spletu. Znan uporabniški vmesnik, okrepljene varnostne možnosti - vključno z zaščito pred spletno krajo identitete - in vgrajeno iskanje vam omogočajo, da odnesete kar največ od svetovnega spleta.
 CONTEXT_OPTIONS=M$ožnosti programa $BrandShortName
 CONTEXT_SAFE_MODE=$Varni način programa $BrandShortName
 OPTIONS_PAGE_TITLE=Vrsta namestitve
 OPTIONS_PAGE_SUBTITLE=Izberite možnosti namestitve
 SHORTCUTS_PAGE_TITLE=Postavitev bližnjic
 SHORTCUTS_PAGE_SUBTITLE=Ustvari programske ikone
+COMPONENTS_PAGE_TITLE=Namestitev komponent po izbiri
+COMPONENTS_PAGE_SUBTITLE=Priporočene komponente po izbiri
+OPTIONAL_COMPONENTS_DESC=Storitev za vzdrževanje omogoča posodabljanje programa $BrandShortName v ozadju.
+MAINTENANCE_SERVICE_CHECKBOX_DESC=Namesti storitev za &vzdrževanje
 SUMMARY_PAGE_TITLE=Povzetek
 SUMMARY_PAGE_SUBTITLE=Vse je pripravljeno za namestitev $BrandShortNamea
 SUMMARY_INSTALLED_TO=$BrandShortName bo nameščen na naslednje mesto:
 SUMMARY_REBOOT_REQUIRED_INSTALL=Za dokončanje namestitve bo morda potreben ponovni zagon računalnika.
 SUMMARY_REBOOT_REQUIRED_UNINSTALL=Za dokončanje odstranjevanja bo morda potreben ponovni zagon računalnika.
 SUMMARY_TAKE_DEFAULTS=U&porabi $BrandShortName kot privzeti brskalnik
 SUMMARY_INSTALL_CLICK=Kliknite Namesti za nadaljevanje.
 SUMMARY_UPGRADE_CLICK=Kliknite Nadgradi za nadaljevanje.
@@ -71,25 +75,25 @@ CREATE_ICONS_DESC=Ustvari ikone za $Bran
 ICONS_DESKTOP=na &namizje
 ICONS_STARTMENU=v mapo Programi v meniju &Start
 ICONS_QUICKLAUNCH=v vrstici &Hitri zagon
 WARN_MANUALLY_CLOSE_APP_INSTALL=$BrandShortName morate zapreti pred nadaljevanjem z namestitvijo.\n\nZa nadaljevanje zaprite $BrandShortName.
 WARN_MANUALLY_CLOSE_APP_UNINSTALL=$BrandFullName morate zapreti, če želite nadaljevati z odstranjevanjem.\n\nZa nadaljevanje zaprite $BrandShortName.
 WARN_MANUALLY_CLOSE_APP_LAUNCH=$BrandShortName se že izvaja.\n\nPreden zaženete različico, ki ste jo pravkar namestili, zaprite $BrandShortName.
 WARN_WRITE_ACCESS=Nimate dostopa za pisanje v namestitveno mapo.\n\nKliknite gumb V redu in izberite drugo mapo.
 WARN_DISK_SPACE=Na tem mestu ni dovolj prostora na disku.\n\nKliknite gumb V redu in izberite drugo mesto.
-WARN_MIN_SUPPORTED_OS_MSG=Brskalnika $BrandShortName žal ni mogoče namestiti. Ta različica namreč potrbuje ${MinSupportedVer} ali novejšo različico.
+WARN_MIN_SUPPORTED_OS_MSG=Brskalnika $BrandShortName žal ni mogoče namestiti. Ta različica namreč potrebuje ${MinSupportedVer} ali novejšo različico.
 WARN_RESTART_REQUIRED_UNINSTALL=Za dokončanje predhodnega odstranjevanja programa $BrandShortName morate ponovno zagnati vaš računalnik. Ga želite ponovno zagnati zdaj?
-WARN_RESTART_REQUIRED_UPGRADE=Za dokončanje predhodnje nadgradnje programa $BrandShortName morate ponovno zagnati vaš računalnik. Ga želite ponovno zagnati zdaj?
+WARN_RESTART_REQUIRED_UPGRADE=Da dokončate predhodno nadgradnjo programa $BrandShortName,  morate svoj računalnik ponovno zagnati. Ga želite ponovno zagnati zdaj?
 ERROR_CREATE_DIRECTORY_PREFIX=Napaka pri ustvarjanju mape:
 ERROR_CREATE_DIRECTORY_SUFFIX=Kliknite Prekliči za ustavitev namestitve ali\nPonovi za ponovni poskus.
 
 UN_CONFIRM_PAGE_TITLE=Odstrani $BrandFullName
-UN_CONFIRM_PAGE_SUBTITLE=Odstranite $BrandFullName iz vašega računalnik.
-UN_CONFIRM_UNINSTALLED_FROM=$BrandShortName bo odstranjen iz naslednjega mesta:
+UN_CONFIRM_PAGE_SUBTITLE=Odstranite $BrandFullName iz svojega računalnika.
+UN_CONFIRM_UNINSTALLED_FROM=$BrandShortName bo odstranjen z naslednjega mesta:
 UN_CONFIRM_CLICK=Kliknite Odstrani za nadaljevanje.
 UN_REMOVE_PROFILES=Odst&rani osebne podatke in nastavitve programa $BrandShortName
 UN_REMOVE_PROFILES_DESC=Vaši zaznamki, shranjena gesla, piškoti in nastavitve bodo trajno odstranjeni. Če želite v prihodnje namestiti drugo različico programa $BrandShortName, boste morda želeli obdržati te podatke.
 
 BANNER_CHECK_EXISTING=Preverjanje obstoječe namestitve ...
 
 STATUS_INSTALL_APP=Nameščanje programa $BrandShortName ...
 STATUS_INSTALL_LANG=Nameščanje jezikovnega paketa (${AB_CD}) ...
--- a/browser/installer/mui.properties
+++ b/browser/installer/mui.properties
@@ -66,28 +66,28 @@ MUI_TEXT_INSTALLING_SUBTITLE=Prosimo, počakajte, medtem ko se $BrandFullNameDA namešča.
 MUI_TEXT_FINISH_TITLE=Namestitev končana
 MUI_TEXT_FINISH_SUBTITLE=Namestitev se je uspešno zaključila.
 MUI_TEXT_ABORT_TITLE=Namestitev prekinjena
 MUI_TEXT_ABORT_SUBTITLE=Namestitev se ni zaključila uspešno.
 MUI_BUTTONTEXT_FINISH=&Končaj
 MUI_TEXT_FINISH_INFO_TITLE=Zaključevanje namestitve programa $BrandFullNameDA
 MUI_TEXT_FINISH_INFO_TEXT=$BrandFullNameDA ste namestili na svoj računalnik.\n\nKliknite gumb Končaj za izhod iz namestitvenega programa.
 MUI_TEXT_FINISH_INFO_REBOOT=Računalnik je potrebno ponovno zagnati, preden bo namestitev programa $BrandFullNameDA končana. Želite računalnik ponovno zagnati takoj?
-MUI_TEXT_FINISH_REBOOTNOW=Ponovno zaženi zdaj
-MUI_TEXT_FINISH_REBOOTLATER=Računalnik želim ponovno zagnati pozneje
+MUI_TEXT_FINISH_REBOOTNOW=Zaženi znova zdaj
+MUI_TEXT_FINISH_REBOOTLATER=Računalnik želim zagnati znova pozneje
 MUI_TEXT_STARTMENU_TITLE=Izbira mape v meniju Start
 MUI_TEXT_STARTMENU_SUBTITLE=Izberite mapo v meniju Start, v katero želite shraniti bližnjice do programa $BrandFullNameDA.
 MUI_INNERTEXT_STARTMENU_TOP=Izberite mapo v meniju Start, v katero želite shraniti bližnjice do programa. Če vnesete neobstoječe ime, bo mapa s tem imenom ustvarjena.
 MUI_TEXT_ABORTWARNING=Ste prepričani, da želite zapreti namestitveni program $BrandFullNameDA?
 MUI_UNTEXT_WELCOME_INFO_TITLE=Pozdravljeni v orodju za odstranjevanje programa $BrandFullNameDA
 MUI_UNTEXT_WELCOME_INFO_TEXT=Ta čarovnik vam bo pomagal pri odstranitvi programa $BrandFullNameDA.\n\nPred odstranitvijo se prepričajte, da ste ugasnili $BrandFullNameDA.\n\n$_CLICK
 MUI_UNTEXT_CONFIRM_TITLE=Odstranjevanje $BrandFullNameDA
 MUI_UNTEXT_CONFIRM_SUBTITLE=$BrandFullNameDA boste odstranili s svojega računalnika.
 MUI_UNTEXT_UNINSTALLING_TITLE=Odstranjevanje poteka
 MUI_UNTEXT_UNINSTALLING_SUBTITLE=Prosimo, počakajte, medtem ko se $BrandFullNameDA odstranjuje.
 MUI_UNTEXT_FINISH_TITLE=Odstranjevanje končano
 MUI_UNTEXT_FINISH_SUBTITLE=Odstranjevanje se je uspešno zaključilo.
 MUI_UNTEXT_ABORT_TITLE=Odstranjevanje prekinjeno
-MUI_UNTEXT_ABORT_SUBTITLE=Odstranjevanje se ni zaključila uspešno.
+MUI_UNTEXT_ABORT_SUBTITLE=Odstranjevanje se ni zaključilo uspešno.
 MUI_UNTEXT_FINISH_INFO_TITLE=Zaključevanje odstranjevanja programa $BrandFullNameDA
-MUI_UNTEXT_FINISH_INFO_TEXT=$BrandFullNameDA ste odstranili s svojega računalnika\n\nKliknite gumb Končaj za izhod iz odstranitvenega programa.
+MUI_UNTEXT_FINISH_INFO_TEXT=$BrandFullNameDA ste odstranili s svojega računalnika\n\nKliknite gumb Končaj, da zapustite program za odstranjevanje.
 MUI_UNTEXT_FINISH_INFO_REBOOT=Računalnik je potrebno ponovno zagnati, preden bo odstranjevanje programa $BrandFullNameDA končano. Želite računalnik ponovno zagnati takoj?
-MUI_UNTEXT_ABORTWARNING=Ste prepričani, da želite zapreti program za odstranjevanje $BrandFullNameDA?
+MUI_UNTEXT_ABORTWARNING=Ste prepričani, da želite zapustiti program za odstranjevanje $BrandFullNameDA?
--- a/browser/installer/override.properties
+++ b/browser/installer/override.properties
@@ -87,27 +87,27 @@ CantWrite="Ni mogoče pisati: "
 CopyFailed=Kopiranje neuspešno
 CopyTo="Kopiranje v "
 Registering="Registracija: "
 Unregistering="Deregistracija: "
 SymbolNotFound="Ni mogoče najti simbola: "
 CouldNotLoad="Ni mogoče naložiti: "
 CreateFolder="Izdelava mape: "
 CreateShortcut="Izdelava bližnjice: "
-CreatedUninstaller="Izdelava odstranitvenega programa: "
+CreatedUninstaller="Izdelava programa za odstranjevanje: "
 Delete="Brisanje datoteke: "
 DeleteOnReboot="Izbris ob ponovnem zagonu: "
-ErrorCreatingShortcut="Napaka pri ustvarjevanju bližnjice: "
+ErrorCreatingShortcut="Napaka pri ustvarjanju bližnjice: "
 ErrorCreating="Napaka pri ustvarjanju: "
-ErrorDecompressing=Napaka pri dekompresiji podatkov! Poškodovan namestitveni program?
+ErrorDecompressing=Napaka pri razširjanju podatkov! Poškodovan namestitveni program?
 ErrorRegistering=Napaka pri registraciji knjižnice DLL
 ExecShell="ExecShell: "
 Exec="Izvajanje: "
-Extract="Dekompresiranje: "
-ErrorWriting="Dekompresiranje: napaka pri pisanju v datoteko "
+Extract="Razširjanje: "
+ErrorWriting="Razširjanje: napaka pri pisanju v datoteko "
 InvalidOpcode=Poškodovan namestitveni program: neveljaven opcode
 NoOLE="Nimam OLE za: "
 OutputFolder="Izhodna mapa: "
 RemoveFolder="Odstranjujem mapo: "
 RenameOnReboot="Preimenovanje ob ponovnem zagonu: "
 Rename="Preimenovanje: "
 Skipped="Izpuščeno: "
 CopyDetails=Skopiraj podrobnosti na odložišče
--- a/browser/profile/bookmarks.inc
+++ b/browser/profile/bookmarks.inc
@@ -9,22 +9,16 @@
 
 #define bookmarks_toolbarfolder Orodna vrstica zaznamkov
 #define bookmarks_toolbarfolder_description Dodajte zaznamke v to mapo, če jih želite imeti v orodni vrstici zaznamkov
 
 # LOCALIZATION NOTE (getting_started):
 # link title for http://en-US.www.mozilla.com/en-US/firefox/central/
 #define getting_started Prvi koraki
 
-# LOCALIZATION NOTE (latest_headlines):
-# link title for the live bookmarks sample, a redirect on
-# http://en-US.fxfeeds.mozilla.com/en-US/firefox/headlines.xml
-# Changing the redirect is subject to approval of l10n-drivers.
-#define latest_headlines Zadnje novice
-
 # LOCALIZATION NOTE (firefox_heading):
 # Firefox links folder name
 #define firefox_heading Mozilla Firefox
 
 # LOCALIZATION NOTE (firefox_help):
 # link title for http://en-US.www.mozilla.com/en-US/firefox/help/
 #define firefox_help Pomoč in nasveti
 
--- a/browser/updater/updater.ini
+++ b/browser/updater/updater.ini
@@ -1,4 +1,6 @@
 ; This file is in the UTF-8 encoding
+; All strings must be less than 600 chars.
 [Strings]
 TitleText=Posodobitve za %MOZ_APP_DISPLAYNAME%
 InfoText=%MOZ_APP_DISPLAYNAME% namešča posodobitve in se bo zagnal čez nekaj trenutkov …
+MozillaMaintenanceDescription=Mozillina storitev za vzdrževanje zagotavlja, da uporabljate najnovejšo in najbolj varno različico Mozilla Firefoxa. Ohranjanje posodobljenega Firefoxa je pomembno za vašo varnost na spletu, zato vam Mozilla toplo priporoča, da imate to storitev vključeno.
new file mode 100644
--- /dev/null
+++ b/chat/accounts.properties
@@ -0,0 +1,5 @@
+# LOCALIZATION NOTE (passwordPromptTitle, passwordPromptText):
+# %S is replaced with the name of the account
+passwordPromptTitle=Geslo za %S
+passwordPromptText=Vnesite svoje geslo za %S, da se prijavite nanj.
+passwordPromptSaveCheckbox=Uporabi Upravitelja gesel, da si to geslo zapomni.
new file mode 100644
--- /dev/null
+++ b/chat/commands.properties
@@ -0,0 +1,23 @@
+# LOCALIZATION NOTE (commands):
+#  %S is a comma separated list of command names.
+commands=Ukazi:%S.\nUporabite /help &lt;ukaz&gt; za več informacij.
+# LOCALIZATION NOTE (noCommand, noHelp):
+#  %S is the command name the user typed.
+noCommand=Ukaz '%S' ne obstaja.
+noHelp=Žal za ukaz '%S' ni pomoči!
+
+sayHelpString=say &lt;sporoćilo&gt;: pošlje sporočilo brez ukazov za obdelavo.
+rawHelpString=raw &lt;sporočilo&gt;: pošlji sporočilo, ne da bi ubežal HTML postavke.
+helpHelpString=help &lt;ime&gt;: pokaže pomoč za ukaz &lt;ime&gt; ali pa seznam možnih ukazov, če ga vtipkate brez parametra.
+
+# LOCALIZATION NOTE (statusCommand):
+#  %1$S is replaced with a status command name
+#   (one of "back", "away", "busy", "dnd", or "offline").
+#  %2$S is replaced with the localized version of that status type
+#   (one of the 5 strings below).
+statusCommand=%1$S &lt;statusno sporočilo&gt;: nastavi status na %2$S, doda neobvezno sporočilo o stanju
+back=na razpolago
+away=odsoten
+busy=ni dostopen
+dnd=ni dostopen
+offline=ni na spletu
new file mode 100644
--- /dev/null
+++ b/chat/conversations.properties
@@ -0,0 +1,41 @@
+# LOCALIZATION NOTE (targetChanged):
+#  %1$S is the new conversation title (display name of the new target),
+#  %2$S is the protocol name used for the new target.
+targetChanged=Pogovor se bo nadaljeval z  %1$S, ob uporabi %2$S.
+
+# LOCALIZATION NOTE (statusChanged):
+#  %1$S is the display name of the contact.
+#  %2$S is the new status type (a value from status.properties).
+statusChanged=%1$S je sedaj %2$S.
+# LOCALIZATION NOTE (statusChangedWithStatusText):
+#  %1$S is the display name of the contact.
+#  %2$S is the new status type (a value from status.properties).
+#  %3$S is the status text (eg. "I'm currently away from the computer").
+statusChangedWithStatusText=%1$S je sedaj %2$S: %3$S.
+# LOCALIZATION NOTE (statusChangedFromUnknown[WithStatusText]):
+#  special case of the previous 2 strings for when the status was
+#  previously unknown. These 2 strings should not mislead the user
+#  into thinking the person's status has just changed.
+statusChangedFromUnknown=%1$S je %2$S.
+statusChangedFromUnknownWithStatusText=%1$S je %2$S: %3$S.
+
+# LOCALIZATION NOTE (statusUnknown):
+#  %S is the display name of the contact.
+statusUnknown=Vaš račun  nima več stika (status %S ni več znan).
+accountDisconnected=Vaš račun  nima več stika.
+
+# LOCALIZATION NOTE (autoReply):
+#  %S is replaced by the text of a message that was sent as an automatic reply.
+autoReply=Samodejni odgovor -%S
+
+# LOCALIZATION NOTE (messenger.conversations.selections.ellipsis):
+#  ellipsis is used when copying a part of a message to show that the message was cut
+messenger.conversations.selections.ellipsis=[…]
+
+# LOCALIZATION NOTE (messenger.conversations.selections.{system,content,action}MessagesTemplate):
+#  These 3 templates are used to format selected messages before copying them.
+#  Do not translate the texts between % characters, but feel free to adjust
+#  whitespace and separators to make them fit your locale.
+messenger.conversations.selections.systemMessagesTemplate=%time% - %message%
+messenger.conversations.selections.contentMessagesTemplate=%time% - %sender%: %message%
+messenger.conversations.selections.actionMessagesTemplate=%time% - %sender%: %message%
new file mode 100644
--- /dev/null
+++ b/chat/facebook.properties
@@ -0,0 +1,1 @@
+connection.error.useUsernameNotEmailAddress=Uporabljajte svoje Facebook uporabniško ime, ne e-poštni naslov
new file mode 100644
--- /dev/null
+++ b/chat/irc.properties
@@ -0,0 +1,147 @@
+# LOCALIZATION NOTE (connection.error.*):
+#   These will show in the account manager if the account is
+#   disconnected because of an error.
+connection.error.lost=Izgubil povezavo s strežnikom
+connection.error.timeOut=Povezava je potekla
+connection.error.certError=Napaka med certificiranjem pri povezovanju s strežnikom
+
+# LOCALIZATION NOTE (joinChat.*):
+#   These show up on the join chat menu. An underscore is for the access key.
+joinChat.channel=_Channel
+joinChat.password=Geslo
+
+# LOCALIZATION NOTE (options.*):
+#   These are the protocol specific options shown in the account manager and
+#   account wizard windows.
+options.server=Strežnik
+options.port=Port
+options.ssl=Uporabi SSL
+options.encoding=Nabor znakov
+options.quitMessage=Sporočilo ob koncu
+options.partMessage=Sporočilo za slovo
+options.showServerTab=Prikaži sporočila iz strežnika
+
+# LOCALIZATION NOTE (ctcp.ping): Semi-colon list of plural forms.
+#  See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
+#   %1$S is the nickname of the user who was pinged.
+#   #2 is the delay (in seconds).
+ctcp.ping=Ping odgovor od %1$ S v #2 sekundi.;. Ping odgovor od %1$S v #2 sekundah..
+# LOCALIZATION NOTE (ctcp.version):
+#   %1$S is the nickname of the user whose version was requested.
+#   %2$S is the version response from the client.
+ctcp.version=%1$S uporablja "%2$S"
+# LOCALIZATION NOTE (ctcp.time):
+#   %1$S is the nickname of the user whose time was requested.
+#   %2$S is the time response.
+ctcp.time=Čas za %1$S je %2$S.
+
+# LOCALZIATION NOTE (command.*):
+#   These are the help messages for each command, the %S is the command name
+#   Each command first gives the parameter it accepts and then a description of
+#   the command.
+command.action=%S &lt;ukrep&gt;: Izvedi ukrep.
+command.ctcp=%S &lt;vzdevek&gt; &lt;msg&gt;: Pošlji sporočilo CTCP za imenovano osebo.
+command.chanserv=%S &lt;ukaz&gt;: pošlji ukaz za ChanServ.
+command.deop=%S &lt;nick1&gt;[,&lt;nick2&gt;]*: Odvzemi nekomu status operaterja kanala. Morate biti operater kanala, da je to mogoče.
+command.devoice=%S &lt;nick1&gt; [, &lt;nick2&gt;] *: Odvzemi nekomu status za glas na kanalu, da ne pride do besede, če je kanal moderiran (+ m). Morate biti operater kanala, da to lahko storite.
+command.invite=%S &lt;vzdevek&gt; [&lt;soba&gt;]: Povabite nekoga, da se vam pridruži na določenem kanalu,  ali na trenutnem kanalu.
+command.join=%S &lt;soba1&gt;[,&lt;soba2&gt;]* [&lt;ključ1&gt;[,&lt;ključ2&gt;]*]:  vnesite enega ali več kanalov, po potrebi s ključem za kanal za vsakega od njih.
+command.kick=%S &lt;vzdevek&gt; [&lt;message&gt;]: Odstranite imenovano osebo s kanala. Morate biti operater kanala, da to lahko storite.
+command.list=%S: Prikaži seznam klepetalnic v omrežju. Pozor, nekateri strežniki vas bodo lahko da odklopili, če boste to poizkusili.
+command.memoserv=%S &lt;ukaz&gt;: pošlji ukaz za MemoServ.
+command.mode=%S (&lt;vzdevek&gt;|&lt;kanal&gt;) (+|-)&lt;nov način&gt;:vklopite oz. izklopite  kanalski ali uporabniški način.
+command.msg=%S &lt;vzdevek&gt; &lt;sporočilo&gt;: Pošlji zasebno sporočilo uporabniku (za razliko od kanala).
+command.nick=%S &lt;nov vzdevek&gt;: spremeni vaš vzdevek.
+command.nickserv=%S &lt;ukaz&gt;: pošlji ukaz za NickServ.
+command.notice=%S &lt;cilj&gt; &lt;sporočilo&gt;: Pošlji opomin uporabniku ali kanalu..
+command.op=%S &lt;vzdevek1&gt;[,&lt;vzdevek2&gt;]*: Dajte nekomu status operaterja kanala. Morate biti operater kanala, da je to mogoče.
+command.operserv=%S &lt;ukaz&gt;: pošlji ukaz za OperServ.
+command.part=%S [sporočilo]: Zapusti trenutni kanal, po želji s sporočilom.
+command.ping=%S [&lt;vzdevek&gt;]: vprašajte, koliko zaostanka ima uporabnik (ali strežnik,  uporabnik ni naveden).
+command.quit=%S &lt;message&gt;: Prekinite povezavo s strežnikom, po želji s sporočilom..
+command.quote=%S &lt;ukaz&gt;: Pošlji strežniku surov ukaz.
+command.time=%S: Prikaže trenutni lokalni čas na IRC strežniku.
+command.topic=%S [&lt;Nova tema&gt;]: Pokaži ali spremeni temo kanala.
+command.umode=%S (+|-)&lt;nov način&gt;: Nastavi oz odklopi uporabniški način.
+command.version=%S &lt;vzdevek&gt;: Zahteva različico uporabnikovega klienta.
+command.voice=%S &lt;nick1&gt;[,&lt;nick2&gt;]*: Da nekomu status za glas na kanalu. Morate biti operater kanala, da je to mogoče.
+command.wallops=%S &lt;message&gt;: Če ne veste kaj je to, potem tega tudi ne boste znali uporabitii (pošlje ukaz vsem, ki so v stiku z zastavico +w in vsem operaterjem na  strežniku.
+command.whowas=%S &lt;vzdevek&gt;: pošlji podatke o uporabniku, ki se je odjavil..
+
+# LOCALIZATION NOTE (message.*):
+#    These are shown as system messages in the conversation.
+#    %1$S is the nick and %2$S is the nick and host of the user who joined.
+message.join=%1$S [%2$S] je prišel v sobo.
+#    %1$S is the nick of who kicked you.
+#    %2$S is message.kicked.reason, if a kick message was given.
+message.kicked.you=%1$S%2$S vas je brcnil.
+#    %1$S is the nick that is kicked, %2$S the nick of the person who kicked
+#    %1$S. %3$S is message.kicked.reason, if a kick message was given.
+message.kicked=%2$S%3$S je brcnil %1$S.
+#    %S is the kick message
+message.kicked.reason=: %S
+#    %1$S is the nickname of the user whose mode was changed, %2$S is the new
+#    mode and %3$S is who set the mode.
+message.mode=način (%1$S %2$S) od %3$S.
+#    %1$S is the old nick and %2$S is the new nick.
+message.nick=%1$S je zdaj znan kot %2$S.
+#    %S is your new nick.
+message.nick.you=Sedaj ste znani kot %S.
+#    The paramter is the message.parted.reason, if a part message is given.
+message.parted.you=Zapustili ste sobo (Part%1$S).
+#    %1$S is the user's nick, %2$S is message.parted.reason, if a part message is given.
+message.parted=%1$S je zapustil sobo (Part%2$S).
+#    %S is the part message supplied by the user.
+message.parted.reason=: %S
+#    %1$S is the user's nick, %2$S is message.quit2 if a quit message is given.
+message.quit=%1$S je zapustil sobo (Quit%2$S).
+#    The paramter is the quit message given by the user.
+message.quit2=: %S
+#    %1$S is the user who changed the topic, %2$S is the new topic.
+message.topicChanged=%1$S je spremenil temo v: %2$S.
+#    %1$S is the user who cleared the topic.
+message.topicCleared=%1$S je počistil temo.
+#    %1$S is the conversation name, %2$S is the topic.
+message.topic=Tema za %1$S je: %2$S.
+#    %S is the conversation name.
+message.topicRemoved=Temo za %S se je odstranilo.
+#    %1$S is the nickname of the invited user, %2$S is the conversation name
+#    they were invited to.
+message.invited=%1$S so uspešno povabili v %2$S.
+#    %S is the nickname of the user who was summoned.
+message.summoned=%S je bil poklican.
+
+# LOCALIZATION NOTE (error.*):
+#    These are shown as error messages in the conversation.
+#    %S is the channel name.
+error.noChannel=Ni kanala:%S.
+error.tooManyChannels=Ne morete se pridružiti %S, ste v že preveč kanalih.
+#    %1$S is your new nick, %2$S is the kill message from the server.
+error.nickCollision=Nik se že uporablja, spremenjen v  %1$S [%2$S].
+error.banned=S tega strežnika so vas pregnali.
+error.bannedSoon=S tega strežnika vas bodo kmalu pregnali.
+error.mode.wrongUser=Ne morete spremeniti načina za druge uporabnike.
+
+# LOCALIZATION NOTE (tooltip.*):
+#    These are the descriptions given in a tooltip with information received
+#    from a whois response.
+#    The human readable ("realname") description of the user.
+tooltip.realname=Ime
+#    The username and hostname that the user connects from (usually based on the
+#    reverse DNS of the user's IP, but often mangled by the server to
+#    protect users).
+tooltip.connectedFrom=Povezan od
+# The away message of the user
+tooltip.away=odsoten
+tooltip.ircOp=IRC Operator
+tooltip.channels=Trenutno na
+tooltip.server=Povezan z
+#    %1$S is the server name, %2$S is the server location.
+tooltip.serverValue=%1$S (%2$S)
+tooltip.idleTime=Nedejaven 
+
+# LOCALIZATION NOTE (gtalk.usernameHint):
+#  This is displayed inside the accountUsernameInfoWithDescription
+#  string defined in imAccounts.properties when the user is
+#  configuring an IRC account.
+usernameHint=in strežnik
new file mode 100644
--- /dev/null
+++ b/chat/status.properties
@@ -0,0 +1,14 @@
+availableStatusType=Na razpolago
+awayStatusType=odsoten
+unavailableStatusType=Ni na razpolago
+offlineStatusType=Ni na spletu
+invisibleStatusType=Neviden
+idleStatusType=Nedejaven 
+mobileStatusType=Mobilnik
+# LOCALIZATION NOTE (unknownStatusType):
+# the status of a buddy is unknown when it's in the list of a disconnected account
+unknownStatusType=Neznano
+
+# LOCALIZATION NOTE (messenger.status.defaultIdleAwayMessage):
+#  This will be the away message put automatically when the user is idle.
+messenger.status.defaultIdleAwayMessage=Trenutno sem stran od računalnika.
new file mode 100644
--- /dev/null
+++ b/chat/twitter.properties
@@ -0,0 +1,101 @@
+# LOCALIZATION NOTE (error.*):
+#   These are errors that will be shown to the user in conversation.
+error.tooLong=Stanje je več kot 140 znakov.
+# LOCALIZATION NOTE (error.general, error.retweet, error.delete):
+#   %1$S will be either the error string returned by the twitter server,
+#   in English, inside parenthesis, or the empty string if we have no specific
+#   message for the error.
+#   %2$S is the message that caused the error.
+error.general=Pri pošiljanju:%2$S je prišlo do napake %1$S
+error.retweet=Med retvitanjem:%2$S je prišlo do napake %1$S
+error.delete=Med brisanjem:%2$S je prišlo do napake %1$S
+
+# LOCALIZATION NOTE (timeline):
+#   This is the title of the conversation tab, %S will be replaced by
+#   @<username>.
+timeline=%S objave
+
+# LOCALIZATION NOTE (action.*):
+#  This will be an action in the context menu of displayed tweets.
+action.copyLink=Kopiraj link na Tweet
+action.retweet=retvitaj
+action.reply=Odgovori
+action.delete=Izbriši
+# LOCALIZATION NOTE (action.follow, action.stopFollowing):
+#  %S will be replaced by the screen name of a twitter user.
+action.follow=Sledi %S
+action.stopFollowing=Nehaj slediti %S
+
+# LOCALIZATION NOTE (event.follow, event.unfollow, event.followed):
+#  This will be displayed in system messages inside the timeline conversation.
+#  %S will be replaced by the screen name of a twitter user.
+event.follow=Sedaj sledite %S.
+event.unfollow=Sedaj več ne sledite %S.
+event.followed=%S vam sedaj sledi.
+# LOCALIZATION NOTE (event.deleted):
+#  %S will be replaced by the text of the deleted tweet.
+event.deleted=Ta tvit ste zbrisali: "%S".
+
+# LOCALIZATION NOTE (replyingToStatusText):
+#  This will be visible in the status bar of the conversation window
+#  while the user is typing a reply to a tweet.
+#  %S will be replaced by the text of the tweet the user is replying to.
+replyingToStatusText=Odgovor na: %S
+
+# LOCALIZATION NOTE (connection.*):
+#   These will be displayed in the account manager in order to show the progress
+#   of the connection.
+#   (These will be displayed in account.connection.progress from
+#    accounts.properties, which adds … at the end, so do not include
+#    periods at the end of these messages.)
+connection.initAuth=Začetek procesa avtentikacije
+connection.requestAuth=Čakanje na vašo avtentikacijo
+connection.requestAccess=Zaključek avtentikacije
+connection.requestTimelines=Zahteva za uporabnikove objave
+# LOCALIZATION NOTE (connection.error.*):
+#   These will show in the account manager if an error occurs during the
+#   connection attempt.
+connection.error.userMismatch=Uporabniško ime se ne sklada.
+connection.error.failedToken=Ni bilo mogoče dobiti žetona za zahtevo.
+connection.error.authCancelled=Prekinili ste postopek avtentikacije.
+connection.error.authFailed=Ni uspelo dobiti avtentikacije.
+connection.error.noNetwork=Omrežne povezave ni na voljo.
+
+# LOCALIZATION NOTE (authPrompt):
+#   This is the prompt in the browser window that pops up to authorize us
+#   to use a Twitter account. It is shown in the title bar of the authorization
+#   window.
+authPrompt=Dovolite uporabo vašega Twitter račuan
+
+# LOCALIZATION NOTE (options.*):
+#   These are the protocol specific options shown in the account manager and
+#   account wizard windows.
+options.track=Sledene ključne besede
+
+# LOCALIZATION NOTE (tooltip.*):
+#   These are the Twitter information that will appear in the tooltip
+#   for each participant on the home timeline.
+# LOCALIZATION NOTE (tooltip.created_at): the date the user joined.
+tooltip.created_at=Uporabnik od
+tooltip.location=Naslov
+tooltip.lang=Jezik
+tooltip.time_zone=Časovni pas
+tooltip.url=Domača stran
+# LOCALIZATION NOTE (tooltip.protected):
+#  whether the user's tweets are publicly visible.
+tooltip.protected=Varuje tvite
+# LOCALIZATION NOTE (tooltip.following):
+#  whether you are subscribed to the user's tweets.
+tooltip.following=Trenutno sledi
+tooltip.description=Opis
+# LOCALIZATION NOTE (tooltip.*_count):
+#  Please see the right side of the official Twitter website UI.
+tooltip.friends_count=Sledi
+tooltip.statuses_count=twiti
+tooltip.followers_count=sledijo
+tooltip.listed_count=Na seznamu
+
+# LOCALIZATION NOTE (yes, no):
+#  These are used to turn true/false values into a yes/no response.
+yes=Da
+no=Ne
new file mode 100644
--- /dev/null
+++ b/chat/xmpp.properties
@@ -0,0 +1,72 @@
+# LOCALIZATION NOTE (connection.*)
+#   These will be displayed in the account manager in order to show the progress
+#   of the connection.
+#   (These will be displayed in account.connection.progress from
+#    accounts.properties, which adds … at the end, so do not include
+#    periods at the end of these messages.)
+connection.initializingStream=Inicializacija toka
+connection.initializingEncryption=Inicializacija šifriranja
+connection.authenticating=Avtentikacija
+connection.gettingResource=Pridobivanje vira
+connection.downloadingRoster=Nalaganje seznama stikov
+
+# LOCALIZATION NOTE (connection.error.*)
+#   These will show in the account manager if an error occurs during the
+#   connection attempt.
+connection.error.failedToCreateASocket=Ni uspelo ustvariti vtičnice (Ali ste brez povezave?)
+connection.error.serverClosedConnection=Strežnik je prekinil povezavo
+connection.error.resetByPeer=Posrednik je ponastavil povezavo
+connection.error.timedOut=Povezava potekla
+connection.error.receivedUnexpectedData=Prejel nepričakovane podatke
+connection.error.incorrectResponse=Prejel napačen odgovor
+connection.error.startTLSRequired=Strežnik zahteva šifriranje, vendar ste ga onemogočili
+connection.error.startTLSNotSupported=Strežnik ne podpira šifriranja, vendar vaša konfiguracija to zahteva
+connection.error.failedToStartTLS=Ni uspelo začeti s šifriranjem
+connection.error.noAuthMec=Strežnik ne nudi mehanizma za avtentikacijo 
+connection.error.noCompatibleAuthMec=Nobenega od avtorizacijskih mehanizmov, ki jih nudi strežnik, se ne podpira
+connection.error.notSendingPasswordInClear=Strežnik podpira avtentikacijo samo s pošiljanjem gesla v nešifrirani obliki
+connection.error.authenticationFailure=Neuspela avtentifikacija
+connection.error.notAuthorized=Dovoljenje zavrnjeno(Ste vnesete napačno geslo?)
+connection.error.failedToGetAResource=Ni uspelo dobiti vira
+
+# LOCALIZATION NOTE (tooltip.*):
+#   These are the titles of lines of information that will appear in
+#   the tooltip showing details about a contact or conversation.
+# LOCALIZATION NOTE (tooltip.status):
+#   %S will be replaced by the XMPP resource identifier
+tooltip.status=Status (%S)
+tooltip.statusNoResource=Stanje
+tooltip.subscription=Abonma
+
+# LOCALIZATION NOTE (chatRoomField.*):
+#   These are the name of fields displayed in the 'Join Chat' dialog
+#   for XMPP accounts.
+#   The _ character won't be displayed; it indicates the next
+#   character of the string should be used as the access key for this
+#   field.
+chatRoomField.room=Soba
+chatRoomField.server=Strežnik
+chatRoomField.nick=_Nick
+chatRoomField.password=Geslo
+
+# LOCALIZATION NOTE
+#  Buddies that aren't in any group on the server will appear in this group.
+#  Try to use the same translation as for defaultGroup in instantbird.properties
+defaultGroup=Stiki
+
+# LOCALIZATION NOTE (options.*):
+#   These are the protocol specific options shown in the account manager and
+#   account wizard windows.
+options.resource=Vir
+options.connectionSecurity=Varnost povezave
+options.connectionSecurity.requireEncryption=Zahteva šifriranje
+options.connectionSecurity.opportunisticTLS=Uporabi šifriranje, če na voljo
+options.connectionSecurity.allowUnencryptedAuth=Dovoli pošiljanje gesla v nešifrirani obliki
+options.connectServer=Strežnik
+options.connectPort=Port
+
+# LOCALIZATION NOTE (gtalk.usernameHint):
+#  This is displayed inside the accountUsernameInfoWithDescription
+#  string defined in imAccounts.properties when the user is
+#  configuring a Google Talk account.
+gtalk.usernameHint=E-poštni naslov
new file mode 100644
--- /dev/null
+++ b/editor/ui/chrome/composer/editingOverlay.dtd
@@ -0,0 +1,78 @@
+<!-- ***** BEGIN LICENSE BLOCK *****
+   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
+   -
+   - The contents of this file are subject to the Mozilla Public License Version
+   - 1.1 (the "License"); you may not use this file except in compliance with
+   - the License. You may obtain a copy of the License at
+   - http://www.mozilla.org/MPL/
+   -
+   - Software distributed under the License is distributed on an "AS IS" basis,
+   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+   - for the specific language governing rights and limitations under the
+   - License.
+   -
+   - The Original Code is Mozilla Communicator client code, released
+   - March 31, 1998.
+   -
+   - The Initial Developer of the Original Code is
+   - Netscape Communications Corporation.
+   - Portions created by the Initial Developer are Copyright (C) 1999-2000
+   - the Initial Developer. All Rights Reserved.
+   -
+   - Contributor(s):
+   -   Sammy Ford
+   -   Blake Ross
+   -   Ryan Cassin (rcassin@supernova.org)
+   -   Daniel Glazman (glazman@netscape.com)
+   -   Stephen Donner (technutz@netscape.net)
+   -   Charles Manske (cmanske@netscape.com)
+   -   Ian Neal (iann_bugzilla@blueyonder.co.uk)
+   -
+   - Alternatively, the contents of this file may be used under the terms of
+   - either of the GNU General Public License Version 2 or later (the "GPL"),
+   - or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+   - in which case the provisions of the GPL or the LGPL are applicable instead
+   - of those above. If you wish to allow use of your version of this file only
+   - under the terms of either the GPL or the LGPL, and not to allow others to
+   - use your version of this file under the terms of the MPL, indicate your
+   - decision by deleting the provisions above and replace them with the notice
+   - and other provisions required by the GPL or the LGPL. If you do not delete
+   - the provisions above, a recipient may use your version of this file under
+   - the terms of any one of the MPL, the GPL or the LGPL.
+   -
+   - ***** END LICENSE BLOCK ***** -->
+
+<!-- File menu items -->
+<!ENTITY openFileCmd.label "Odpri datoteko …">
+<!ENTITY openFileCmd.accesskey "O">
+<!ENTITY openFileCmd.key "O">
+<!ENTITY openRemoteCmd.label "Odpri spletni naslov …">
+<!ENTITY openRemoteCmd.accesskey "L">
+<!ENTITY openRemoteCmd.key "L">
+<!ENTITY fileRecentMenu.label "Nedavne strani">
+<!ENTITY fileRecentMenu.accesskey "R">
+<!ENTITY saveCmd.label "Shrani">
+<!ENTITY saveCmd.accesskey "S">
+<!ENTITY saveAsCmd.label "Shrani kot …">
+<!ENTITY saveAsCmd.accesskey "A">
+<!ENTITY saveAsChangeEncodingCmd.label "Shrani in spremeni nabor znakov">
+<!ENTITY saveAsChangeEncodingCmd.accesskey "E">
+<!ENTITY publishCmd.label "Objavi">
+<!ENTITY publishCmd.accesskey "b">
+<!ENTITY publishCmd.key "S">
+<!ENTITY publishAsCmd.label "Objavi kot …">
+<!ENTITY publishAsCmd.accesskey "k">
+<!ENTITY fileRevert.label "Povrni">
+<!ENTITY fileRevert.accesskey "P">
+
+<!-- Edit menu items -->
+<!ENTITY publishSettings.label "Nastavitve strani za objavo …">
+<!ENTITY publishSettings.accesskey "b">
+
+<!-- Toolbar buttons/items -->
+<!ENTITY newToolbarCmd.label "Novo">
+<!ENTITY newToolbarCmd.tooltip "Ustvari novo stran v Composerju">
+<!ENTITY openToolbarCmd.label "Odpri">
+<!ENTITY openToolbarCmd.tooltip "Odpri krajevno datoteko">
+<!ENTITY saveToolbarCmd.tooltip "Shrani datoteko na krajevno mesto">
+<!ENTITY publishToolbarCmd.tooltip "Prenesi datoteko na oddaljeno mesto">
\ No newline at end of file
--- a/editor/ui/chrome/composer/editor.dtd
+++ b/editor/ui/chrome/composer/editor.dtd
@@ -38,64 +38,64 @@
 <!-- Window title -->
 <!-- LOCALIZATION NOTE  (editorWindow.titlemodifier): DONT_TRANSLATE -->
 <!ENTITY editorWindow.titlemodifier "Composer"> 
 <!ENTITY editorWindow.titlemodifiermenuseparator " - ">
 
 <!-- Menu items:  the . means that the menu item isn't implemented yet -->
 
 <!-- Toolbar-only items -->
-<!ENTITY compositionToolbar.tooltip "Vrstica za sestavo besedil">
+<!ENTITY compositionToolbar.tooltip "Orodna vrstica za sestavke">
 <!ENTITY previewToolbarCmd.label "Brskaj">
 <!ENTITY previewToolbarCmd.tooltip "Naloži to stran v brskalnik">
 
 <!-- File menu items -->
-<!ENTITY exportToTextCmd.label "Izvozi v besedilo…">
-<!ENTITY exportToTextCmd.accesskey "v">
+<!ENTITY exportToTextCmd.label "Izvozi v besedilo …">
+<!ENTITY exportToTextCmd.accesskey "I">
 <!ENTITY previewCmd.label "Brskaj po strani">
-<!ENTITY previewCmd.accesskey "p">
+<!ENTITY previewCmd.accesskey "B">
 <!ENTITY sendPageCmd.label "Pošlji stran…">
-<!ENTITY sendPageCmd.accesskey "s">
+<!ENTITY sendPageCmd.accesskey "š">
 
 <!-- View menu items -->
 <!ENTITY compositionToolbarCmd.label "Orodna vrstica za sestavke">
-<!ENTITY compositionToolbarCmd.accesskey "s">
+<!ENTITY compositionToolbarCmd.accesskey "o">
 <!ENTITY formattingToolbarCmd.label "Orodna vrstica za oblikovanje">
 <!ENTITY formattingToolbarCmd.accesskey "o">
 <!ENTITY editmodeToolbarCmd.label "Orodna vrstica za urejevalni način">
-<!ENTITY editmodeToolbarCmd.accesskey "u">
+<!ENTITY editmodeToolbarCmd.accesskey "o">
 
 <!-- Format menu items -->
 <!ENTITY formatMenu.label "Oblikovanje">
 <!ENTITY formatMenu.accesskey "O">
-<!ENTITY grid.label "Nastavitev mreže">
-<!ENTITY grid.accesskey "t">
+
+<!ENTITY grid.label "Nameščanje mreže">
+<!ENTITY grid.accesskey "m">
 <!ENTITY pageProperties.label "Naslov strani in lastnosti…">
-<!ENTITY pageProperties.accesskey "l">
+<!ENTITY pageProperties.accesskey "N">
 
 <!-- Tools menu items -->
 <!ENTITY validateCmd.label "Validiraj HTML">
 <!ENTITY validateCmd.accesskey "V">
 
 <!-- Display Mode toolbar and View menu items -->
 <!ENTITY NormalModeTab.label "Normalno">
-<!ENTITY NormalMode.label "NOrmalno urejanje">
+<!ENTITY NormalMode.label "Normalni način urejanja">
 <!ENTITY NormalMode.accesskey "N">
-<!ENTITY NormalMode.tooltip "Kaže robove tabel in sidra">
+<!ENTITY NormalMode.tooltip "Prikaži robove tabel in sidra z imenom">
 <!ENTITY AllTagsModeTab.label "Oznake HTML">
 <!ENTITY AllTagsMode.label "Oznake HTML">
-<!ENTITY AllTagsMode.accesskey "a">
-<!ENTITY AllTagsMode.tooltip "Kaže ikone za vsek oznake HTML">
+<!ENTITY AllTagsMode.accesskey "Z">
+<!ENTITY AllTagsMode.tooltip "Prikaži ikone za vse oznake HTML">
 <!-- LOCALIZATION NOTE: (HTMLSourceModeTab.dir, HTMLSourceModeTab.label)
      Do NOT translate text for 'HTMLSourceModeTab.dir', use latin "ltr" if
      you want the <html> image to left of the 'HTMLSourceModeTab.label' text,
      or use latin "rtl" if you want this image to the right of text. You do
      not need to include HTML in the label 'HTMLSourceModeTab.label' -->
 <!ENTITY HTMLSourceModeTab.dir "ltr">
-<!ENTITY HTMLSourceModeTab.label "Izvor">
-<!ENTITY HTMLSourceMode.label "Izvorni HTML">
+<!ENTITY HTMLSourceModeTab.label "Vir">
+<!ENTITY HTMLSourceMode.label "Izvirni HTML">
 <!ENTITY HTMLSourceMode.accesskey "H">
-<!ENTITY HTMLSourceMode.tooltip "Uredi izvorni HTML">
+<!ENTITY HTMLSourceMode.tooltip "Uredi izvirni HTML">
 <!ENTITY PreviewModeTab.label "Predogled">
 <!ENTITY PreviewMode.label "Predogled">
 <!ENTITY PreviewMode.accesskey "P">
 <!ENTITY PreviewMode.tooltip "Prikaži kot WYSIWYG (kot v brskalniku)">
-
--- a/editor/ui/chrome/composer/editor.properties
+++ b/editor/ui/chrome/composer/editor.properties
@@ -1,200 +1,202 @@
 # LOCALIZATION NOTE FILE: embedded "\n" represent HTML breaks (<br>)
 # Don't translate embedded "\n".
-# Don't translate strings like this: %variable%
+# Don't translate strings like this: %variable% 
 #  as they will be replaced using JavaScript
 #
 No=Ne
 Save=Shrani
 More=Več
 Less=Manj
 MoreProperties=Več lastnosti
 FewerProperties=Manj lastnosti
-PropertiesAccessKey=Z
+PropertiesAccessKey=P
 None=Nič
 none=nič
 OpenHTMLFile=Odpri datoteko HTML
 OpenTextFile=Odpri besedilno datoteko
 SelectImageFile=Izberi slikovno datoteko
 SaveDocument=Shrani stran
 SaveDocumentAs=Shrani stran kot
 SaveTextAs=Shrani besedilo kot
 EditMode=Urejevalni način
 Preview=Predogled
 Publish=Objavi
 PublishPage=Objavi stran
 DontPublish=Ne objavi
-SavePassword=Uporabite Upravitelja gesel, da to geslo shrani
-CorrectSpelling=(pravilno črkovano)
-NoSuggestedWords=(ni predlaganih besed)
+SavePassword=Uporabi Upravitelja gesel, da to geslo shrani
+CorrectSpelling=(popravi črkovanje)
+NoSuggestedWords=(ni predlogov za izraz)
 NoMisspelledWord=Vse besede so brez napak.
 CheckSpellingDone=Črkovanje je zaključeno.
 CheckSpelling=Preveri črkovanje
 InputError=Napaka
-Alert=Pozor
-CantEditFramesetMsg=Composer ne more urejati okvirov HTML oziroma strani z notranjimi (inline) okviri. Za 'framesete' poizkusite urediti vsako stran posebej. Za strani z 'iframes' shranite kopijo in odstranite oznako <iframe> .
+Alert=Opozorilo
+CantEditFramesetMsg=Composer ne more urejati okvirov HTML oziroma strani z notranjimi (inline) okviri. Za 'framesete' poizkusite urediti stran za vsak okvir posebej. Za strani z 'iframes' shranite kopijo strani in odstranite oznako <iframe>.
 CantEditMimeTypeMsg=Te vrste strani ni mogoče urejati.
 CantEditDocumentMsg=Te strani iz neznanega vzroka ni mogoče urejati,
 BeforeClosing=pred zapiranjem
 BeforePreview=pred ogledom strani v brskalniku
 BeforeValidate=pred preverjanjem dokumenta
 # LOCALIZATION NOTE (SaveFilePrompt, PublishPrompt): Don't translate %title% and %reason% (this is the reason for asking user to close, such as "before closing")
-SaveFilePrompt=Naj se spremembe shrani v "%title%" %reason%? 
-PublishPrompt=Naj se spremembe objavi v "%title%" %reason%? 
+SaveFilePrompt=Naj se spremembe shrani v "%title%" %reason%?  
+PublishPrompt=Naj se spremembe shrani v "%title%" %reason%?  
 SaveFileFailed=Datoteke ni uspelo shraniti!
 
 # Publishing error strings:
 # LOCALIZATION NOTE Don't translate %dir% or %file% in the Publishing error strings:
 FileNotFound=Datoteke %file% ne najdem.
 SubdirDoesNotExist=Podimenik "%dir%" ne obstaja na tem strežniku, ali pa je ime datoteke "%file%" že zasedeno, ker ga uporablja drug podimenik.
-FilenameIsSubdir=Datotečno ime "%file%" je ime že obstoječega podimenika.
+FilenameIsSubdir=Ime datoteke %file% je že zasedeno, ker ga uporablja drug podimenik.
 ServerNotAvailable=Strežnik ni na voljo. Preverite svojo povezavo in poskusite pozneje.
-Offline=Trenutno ste brez povezave. Kliknite ikono poleg spodnjega desnega robu na kateremkoli oknu za delo s povezavo.
-DiskFull=Na disku ni dovolj prostora za shranjevanje "%file%."
+Offline=Trenutno ste brez povezave. Za delo s povezavo kliknite ikono poleg spodnjega desnega roba v kateremkoli oknu.
+DiskFull=Na disku ni dovolj prostora za shranjevanje "%file%".
 NameTooLong=Ime datoteke ali podimenika je predolgo.
 AccessDenied=Nimate pravic objavljanja na tem mestu.
 UnknownPublishError=Prišlo je do neznane napake pri objavljanju.
 PublishFailed=Objavljanje ni uspelo.
 PublishCompleted=Objavljanje zaključeno.
 AllFilesPublished=Vse datoteke so objavljene
 # LOCALIZATION NOTE Don't translate %x% or %total%
 FailedFileMsg=%x% od %total% datotek ni uspelo objaviti.
 # End-Publishing error strings
 Prompt=Poziv
 # LOCALIZATION NOTE (PromptFTPUsernamePassword): Don't translate %host% 
 PromptFTPUsernamePassword=Vnesite uporabniško ime in geslo za strežnik FTP %host%
-RevertCaption=Povrni se na zadnje shranjeno
-Revert=Povrni se
+RevertCaption=Povrni na zadnje shranjeno
+Revert=Povrni
 SendPageReason=pred pošiljanjem te strani
 Send=Pošlji
 ## LOCALIZATION NOTE (PublishProgressCaption, PublishToSite, AbandonChanges): Don't translate %title%
 PublishProgressCaption=Objava: %title%
 PublishToSite=Objava na stran: %title%
-AbandonChanges=Naj se neshranjene spremembe "%title%" opusti in stran ponovno naloži?
+AbandonChanges=Naj se spremembe za "%title%", ki niso shranjene, opusti in stran ponovno naloži?
 DocumentTitle=Naslov strani
 NeedDocTitle=Vnesite naslov te strani.
-DocTitleHelp=To identificira stran v imenu okna in v zaznamkih.
+DocTitleHelp=To identificira stran v naslovu okna in v zaznamkih.
 CancelPublishTitle=Naj objavo prekličem?
 ## LOCALIZATION NOTE: "Continue" in this sentence must match the text for
 ## the CancelPublishContinue key below
-CancelPublishMessage=Preklic med objavljanjem lahko za seboj pusti datoteke, ki niso bile v celoti prenesene. Bi želeli nadaljevati ali preklicati?
+CancelPublishMessage=Preklic med objavljanjem lahko za seboj pusti datoteke, ki niso bile v celoti prenesene. Želite nadaljevati ali preklicati?
 CancelPublishContinue=Nadaljuj
 MissingImageError=Vnesite ali izberite sliko vrste gif, jpg, or png.
 EmptyHREFError=Izberite lokacijo za novo povezavo.
 LinkText=Besedilo povezave
 LinkImage=Slika povezave
 MixedSelection=[Mešana izbira]
 Mixed=(mešano)
 EnterLinkText=Vnesite besedilo za prikaz pri povezavi:
-EnterLinkTextAccessKey=R
+EnterLinkTextAccessKey=T
 EmptyLinkTextError=Vnesite nekaj besedila za povezavo.
 EditTextWarning=To bo zamenjalo obstoječo vsebino.
 #LOCALIZATION NOTE (ValidateNumber):Don't translate: %n% %min% %max%
 ValidateRangeMsg=Vneseno število (%n%) je izven dovoljenega obsega.
 ValidateNumberMsg=Vnesite število med %min% in %max%.
 MissingAnchorNameError=Vnesite ime za to sidro.
 #LOCALIZATION NOTE (DuplicateAnchorNameError): Don't translate %name%
-DuplicateAnchorNameError=%name% na tej strani že obstaja. Vnesite kako drugo ime.
+DuplicateAnchorNameError="%name%" na tej strani že obstaja. Vnesite kako drugo ime.
 BulletStyle=Slog alinej
 SolidCircle=Zapolnjen krog
 OpenCircle=Krožnica
 SolidSquare=Zapolnjen kvadrat
 NumberStyle=Slog za številke
 Automatic=Samodejno
 Style_1=1, 2, 3 …
 Style_I=I, II, III …
 Style_i=i, ii, iii …
 Style_A=A, B, C …
 Style_a=a, b, c …
 Pixels=pik
 Percent=odstotkov
 PercentOfCell=% celice
 PercentOfWindow=% okna
 PercentOfTable=% tabele
-untitled=brez naslova
+#LOCALIZATION NOTE (untitledTitle): %S is the window #.  No plural handling needed.
+untitledTitle=brez-naslova-%S
+untitledDefaultFilename=brez naslova
 ShowToolbar=Pokaži orodno vrstico
 HideToolbar=Skrij orodno vrstico
-ImapError=Slike ni moč naložiti 
+ImapError=Slike ni moč naložiti  
 ImapCheck=\nIzberite novo lokacijo (URI) in poskusite znova.
 SaveToUseRelativeUrl=Relativne URI-je se lahko uporablja samo straneh, ki so že shranjene
 NoNamedAnchorsOrHeadings=(Na tej strani ni ne poimenovanih sider ne naslovov)
 TextColor=Barva besedila
 HighlightColor=Barva označenega besedila
 PageColor=Barva ozadja strani
 BlockColor=Barva ozadja bloka
 TableColor=Barva ozadja tabele
 CellColor=Barva ozadja celice
 TableOrCellColor=Barva tabele ali celice
 LinkColor=Barva besedila povezave
 ActiveLinkColor=Barva besedila aktivne povezave
 VisitedLinkColor=Barva besedila že obiskane povezave
 NoColorError=Izberite barvo s klikom ali vnesite veljaven niz HTML za barve
 Table=Tabela
 TableCell=Celica tabele
-NestedTable=Vgnezdena tabela
+NestedTable=Ugnezdena tabela
 HLine=Vodoravna črta
-Link=Povezava
+Link=Poveži
 Image=Slika
 ImageAndLink=Slika in povezava
 NamedAnchor=Poimenovano sidro
 List=Seznam
 ListItem=Postavka v seznamu
 Form=Obrazec
 InputTag=Polje obrazca
 InputImage=Slika obrazca
 TextArea=Besedilno področje
 Select=Izbirni seznam
 Button=Gumb
 Label=Oznaka
 FieldSet=Nabor polj
 Tag=Oznaka
 MissingSiteNameError=Vnesite ime za to stran za objavo.
-MissingPublishUrlError=Vnesite prosim lokacijo za objavo te strani.
+MissingPublishUrlError=Vnesite lokacijo za objavo te strani.
 MissingPublishFilename=Vnesite ime datoteke za trenutno stran.
 #LOCALIZATION NOTE (DuplicateSiteNameError): Don't translate %name%
 DuplicateSiteNameError="%name%" že obstaja. Vnesite kako drugo ime za spletišče.
-AdvancedProperties=Napredne nastavitve …
+AdvancedProperties=Napredne lastnosti …
 AdvancedEditForCellMsg=Napredno urejanje ni mogoče, če je izbranih več celic
 # LOCALIZATION NOTE (ObjectProperties):Don't translate "%obj%" it will be replaced with one of above object nouns
 ObjectProperties=%obj% lastnosti …
 # LOCALIZATION NOTE This character must be in the above string and not confict with other accesskeys in Format menu
-ObjectPropertiesAccessKey=O
+ObjectPropertiesAccessKey=o
 # LOCALIZATION NOTE (JoinSelectedCells): This variable should contain the "tableJoinCells.accesskey" 
 # letter as defined in editorOverlay.dtd
 JoinSelectedCells=Združi izbrane celice
 # LOCALIZATION NOTE (JoinCellToRight): This variable should contain the "tableJoinCells.accesskey" 
 # letter as defined in editorOverlay.dtd
 JoinCellToRight=Združi s celico na desni
 JoinCellAccesskey=j
 # LOCALIZATION NOTE (TableSelectKey): Ctrl key on a keyboard
 TableSelectKey=Ctrl+
 # LOCALIZATION NOTE (XulKeyMac): Command key on a Mac keyboard
 XulKeyMac=Cmd+
 # LOCALIZATION NOTE (Del): Del key on a keyboard
 Del=Del
-Delete=Zbriši
-DeleteCells=Zbriši celice
-DeleteTableTitle=Zbriši vrstice ali stolpce
-DeleteTableMsg=Če zmanjšate število vrstic oziroma stolpcev, se bo nekatere celice in njih vsebino zbrisalo. Ali to res želite?
-Clear=Pobriši
+Delete=Izbriši
+DeleteCells=Izbriši celice
+DeleteTableTitle=Izbriši vrstice ali stolpce
+DeleteTableMsg=Če zmanjšate število vrstic oziroma stolpcev, se bo nekatere celice in njih vsebino izbrisalo. Ali to res želite?
+Clear=Počisti
 #Mouse actions
 Click=Klikni
 Drag=Povlecite
 Unknown=Neznano
 #
 # LOCALIZATION NOTE "RemoveTextStylesAccesskey" is used for both
 #  menu items: "RemoveTextStyles" and "StopTextStyles"
-RemoveTextStylesAccesskey=x
+RemoveTextStylesAccesskey=X
 RemoveTextStyles=Odstrani vse besedilne sloge
 StopTextStyles=Prenehaj besedilne sloge
 #
 # LOCALIZATION NOTE "RemoveLinksAccesskey" is used for both
 #  menu items: "RemoveLinks" and "StopLinks"
-RemoveLinksAccesskey=o
+RemoveLinksAccesskey=n
 RemoveLinks=Odstrani povezave
 StopLinks=Prekini povezavo
 #
-NoFormAction=Priporoča se, da vnesete akcijo za ta obrazec. Samodostavni obrazci so napredna tehnika, ki ne deluje z vsemi brskalniki.
+NoFormAction=Priporoča se, da vnesete akcijo za ta obrazec. Samodostavni obrazci so napredna tehnika, ki ne deluje dosledno v vseh brskalnikih.
 NoAltText=Če je slika pomembna za pomen spletne strani, morate zanjo vnesti nadomestno besedilo, ki se bo med nalaganjem slike v besedilnih brskalnikih in v ostalih brskalnikih izpisalo, medtem ko se slika nalaga ali pa v primeru, da je nalaganje slik onemogočeno.
 #
 Malformed=Vira ni bilo mogoče pretvoriti nazaj v dokument, ker nima pravilne oblike XHTML.
 NoLinksToCheck=Ni elementov, katerih povezave bi bilo potrebno preveriti
--- a/editor/ui/chrome/composer/editorOverlay.dtd
+++ b/editor/ui/chrome/composer/editorOverlay.dtd
@@ -38,75 +38,28 @@
    - the provisions above, a recipient may use your version of this file under
    - the terms of any one of the MPL, the GPL or the LGPL.
    -
    - ***** END LICENSE BLOCK ***** -->
 
 <!-- Attn: Localization - some of the menus in this dialog directly affect mail also. -->
 
 <!-- File menu items -->
-<!ENTITY fileMenu.label "Datoteka">
-<!ENTITY fileMenu.accesskey "D">
-<!ENTITY openFileCmd.label "Odpri datoteko …">
-<!ENTITY openFileCmd.accesskey "O">
-<!ENTITY openFileCmd.key "O">
-<!ENTITY openRemoteCmd.label "Odpri spletno mesto …">
-<!ENTITY openRemoteCmd.accesskey "s">
-<!ENTITY openRemoteCmd.key "s">
-<!ENTITY fileRecentMenu.label "Nedavne strani">
-<!ENTITY fileRecentMenu.accesskey "N">
-<!ENTITY fileRevert.label "Povrni se">
-<!ENTITY fileRevert.accesskey "P">
-<!ENTITY saveCmd.label "Shrani">
-<!ENTITY saveCmd.accesskey "S">
 <!ENTITY saveCmd.key "S">
-<!ENTITY saveAsCmd.label "Shrani kot …">
-<!ENTITY saveAsCmd.accesskey "k">
-
-<!ENTITY publishCmd.label "Objavi">
-<!ENTITY publishCmd.accesskey "b">
-<!ENTITY publishCmd.key "S">
-<!ENTITY publishAsCmd.label "Objavi kot …">
-<!ENTITY publishAsCmd.accesskey "j">
-<!ENTITY saveAsChangeEncodingCmd.label "Shrani in spremeni nabor znakov">
-<!ENTITY saveAsChangeEncodingCmd.accesskey "h">
-<!ENTITY printSetupCmd.label "Priprava strani …">
-<!ENTITY printSetupCmd.accesskey "r">
-<!ENTITY printCmd.label "Natisni …">
-<!ENTITY printCmd.accesskey "N">
-<!ENTITY printCmd.key "N">
-<!ENTITY closeCmd.label "Zapri">
-<!ENTITY closeCmd.accesskey "Z">
-<!ENTITY closeCmd.key "t">
 
 <!-- Edit menu items -->
-<!ENTITY editMenu.label "Urejaj">
-<!ENTITY editMenu.accesskey "U">
 <!ENTITY pasteNoFormatting.label "Prilepi brez oblikovanja">
 <!ENTITY pasteNoFormatting.accesskey "P">
 <!ENTITY pasteNoFormatting.key "V">
 <!ENTITY pasteAs.label "Prilepi kot">
 <!ENTITY pasteAs.accesskey "k">
-<!ENTITY publishSettings.label "Objavi nastavitve strani …">
-<!ENTITY publishSettings.accesskey "O">
-<!ENTITY pasteAsQuotationCmd.label "Prilepi kot citat">
+<!ENTITY pasteAsQuotationCmd.label "Prilepi kot navedek">
 <!ENTITY pasteAsQuotationCmd.accesskey "r">
 <!ENTITY pasteAsQuotationCmd.key "o">
 <!ENTITY findCmd.label "Išči in zamenjaj …">
-<!ENTITY findCmd.accesskey "I">
-<!ENTITY findCmd.key "I">
-<!ENTITY findCmd.key2 "VK_F19">
-<!ENTITY findAgainCmd.label "Ponovno najdi">
-<!ENTITY findAgainCmd.accesskey "n">
-<!ENTITY findAgainCmd.key "G">
-<!ENTITY findAgainCmd.key2 "VK_F3">
-<!ENTITY findPrevCmd.label "Najdi prejšnje">
-<!ENTITY findPrevCmd.accesskey "a">
-<!ENTITY findPrevCmd.key "G">
-<!ENTITY findPrevCmd.key2 "VK_F3">
 <!ENTITY enableInlineSpellChecker.label "Preverjaj črkovanje, medtem ko pišem">
 <!ENTITY enableInlineSpellChecker.accesskey "e">
 <!ENTITY checkSpellingCmd2.label "Preveri črkovanje">
 <!ENTITY checkSpellingCmd2.accesskey "v">
 <!ENTITY checkSpellingCmd2.key "p">
 
 <!-- Insert menu items -->
 <!ENTITY insertMenu.label "Vstavi">
@@ -125,42 +78,20 @@
 <!ENTITY insertHTMLCmd.label "HTML …">
 <!ENTITY insertHTMLCmd.accesskey "H">
 <!ENTITY insertCharsCmd.label "Znaki in simboli …">
 <!ENTITY insertCharsCmd.accesskey "Z">
 <!ENTITY insertBreakAllCmd.label "Prelomi pod sliko/slikami">
 <!ENTITY insertBreakAllCmd.accesskey "r">
 
 <!-- Used just in context popup. -->
-<!ENTITY spellCheckNoSuggestions.label "(Ni najti predlogov)">
-<!ENTITY spellCheckIgnoreWord.label "Prezri besedo">
-<!ENTITY spellCheckIgnoreWord.accesskey "P">
-<!ENTITY spellCheckAddToDictionary.label "Dodaj v slovar">
-<!ENTITY spellCheckAddToDictionary.accesskey "D">
 <!ENTITY createLinkCmd.label "Vstavi povezavo …">
 <!ENTITY createLinkCmd.accesskey "V">
 <!ENTITY editLinkCmd.label "Uredi povezavo v novem Composerju">
 <!ENTITY editLinkCmd.accesskey "U">
-<!-- (Toplevel Edit menu uses utilityOverlay) -->
-<!ENTITY undoCmd.label "Prekliči">
-<!ENTITY undoCmd.accesskey "P">
-<!ENTITY redoCmd.label "Ponovi">
-<!ENTITY redoCmd.accesskey "o">
-<!ENTITY cutCmd.label "Izreži">
-<!ENTITY cutCmd.accesskey "I">
-<!ENTITY copyCmd.label "Kopiraj">
-<!ENTITY copyCmd.accesskey "K">
-<!ENTITY pasteCmd.label "Prilepi">
-<!ENTITY pasteCmd.accesskey "r">
-<!ENTITY deleteCmd.label "Izbriši">
-<!ENTITY deleteCmd.accesskey "z">
-<!ENTITY clearCmd.label "Pobriši">
-<!ENTITY clearCmd.accesskey "b">
-<!ENTITY selectAllCmd.label "Izberi vse">
-<!ENTITY selectAllCmd.accesskey "v">
 
 <!-- Font Face SubMenu -->
 <!ENTITY FontFaceSelect.tooltip "Izberite pisavo">
 <!ENTITY fontfaceMenu.label "Pisava">
 <!ENTITY fontfaceMenu.accesskey "P">
 <!ENTITY fontVarWidth.label "Spremenljiva širina">
 <!ENTITY fontVarWidth.accesskey "S">
 <!ENTITY fontFixedWidth.label "Stalna širina">
@@ -199,26 +130,26 @@
 <!ENTITY size-x-largeCmd.accesskey "x">
 <!ENTITY size-xx-largeCmd.label "xx-velika">
 <!ENTITY size-xx-largeCmd.accesskey "i">
 
 <!-- Font Style SubMenu -->
 <!ENTITY fontStyleMenu.label "Slog pisave">
 <!ENTITY fontStyleMenu.accesskey "S">
 <!ENTITY styleBoldCmd.label "Krepko">
-<!ENTITY styleBoldCmd.accesskey "K">
-<!ENTITY styleBoldCmd.key "K">
+<!ENTITY styleBoldCmd.accesskey "B">
+<!ENTITY styleBoldCmd.key "B">
 <!ENTITY styleItalicCmd.label "Ležeče">
-<!ENTITY styleItalicCmd.accesskey "L">
-<!ENTITY styleItalicCmd.key "L">
+<!ENTITY styleItalicCmd.accesskey "I">
+<!ENTITY styleItalicCmd.key "I">
 <!ENTITY styleUnderlineCmd.label "Podčrtano">
-<!ENTITY styleUnderlineCmd.accesskey "P">
-<!ENTITY styleUnderlineCmd.key "P">
+<!ENTITY styleUnderlineCmd.accesskey "U">
+<!ENTITY styleUnderlineCmd.key "U">
 <!ENTITY styleStrikeThruCmd.label "Prečrtano">
-<!ENTITY styleStrikeThruCmd.accesskey "e">
+<!ENTITY styleStrikeThruCmd.accesskey "H">
 <!ENTITY styleSuperscriptCmd.label "Nadpisano">
 <!ENTITY styleSuperscriptCmd.accesskey "N">
 <!ENTITY styleSubscriptCmd.label "Podpisano">
 <!ENTITY styleSubscriptCmd.accesskey "o">
 <!ENTITY styleNonbreakingCmd.label "Se ne sme deliti">
 <!ENTITY styleNonbreakingCmd.accesskey "m">
 <!ENTITY styleEm.label "Poudarek">
 <!ENTITY styleEm.accesskey "u">
@@ -241,17 +172,17 @@
 <!ENTITY formatFontColor.accesskey "i">
 <!ENTITY tableOrCellColor.label "Barva ozadja tabele ali celice …">
 <!ENTITY tableOrCellColor.accesskey "B">
 
 <!ENTITY formatRemoveStyles.key "D">
 <!ENTITY formatRemoveLinks.key "K">
 <!ENTITY formatRemoveNamedAnchors.label "Odstrani sidra z imenom">
 <!ENTITY formatRemoveNamedAnchors.accesskey "D">
-<!ENTITY formatRemoveNamedAnchors.key "A">
+<!ENTITY formatRemoveNamedAnchors2.key "A">
 
 <!ENTITY paragraphMenu.label "Odstavek">
 <!ENTITY paragraphMenu.accesskey "t">
 <!ENTITY paragraphParagraphCmd.label "Odstavek">  
 <!ENTITY paragraphParagraphCmd.accesskey "t">
 <!ENTITY heading1Cmd.label "Glava 1">
 <!ENTITY heading1Cmd.accesskey "1">
 <!ENTITY heading2Cmd.label "Glava 2">
@@ -261,17 +192,17 @@
 <!ENTITY heading4Cmd.label "Glava 4">
 <!ENTITY heading4Cmd.accesskey "4">
 <!ENTITY heading5Cmd.label "Glava 5">
 <!ENTITY heading5Cmd.accesskey "5">
 <!ENTITY heading6Cmd.label "Glava 6">
 <!ENTITY heading6Cmd.accesskey "6">
 <!ENTITY paragraphAddressCmd.label "Naslov">
 <!ENTITY paragraphAddressCmd.accesskey "N">
-<!ENTITY paragraphPreformatCmd.label "Vnaprej formatirano">
+<!ENTITY paragraphPreformatCmd.label "Vnaprej oblikovano">
 <!ENTITY paragraphPreformatCmd.accesskey "V">
 
 <!-- List menu items -->
 <!ENTITY formatlistMenu.label "Seznam">
 <!ENTITY formatlistMenu.accesskey "S ">
 <!ENTITY noneCmd.label "Nič">
 <!ENTITY noneCmd.accesskey "N">
 <!ENTITY listBulletCmd.label "Z vidnimi gumbi">
@@ -331,26 +262,26 @@
 <!-- Select Submenu -->
 <!ENTITY tableSelectMenu.label "Izberi">
 <!ENTITY tableSelectMenu.accesskey "I">
 
 <!ENTITY tableSelectMenu2.label "Izberi tabelo">
 <!ENTITY tableSelectMenu2.accesskey "I">
 <!ENTITY tableInsertMenu2.label "Vstavi tabelo">
 <!ENTITY tableInsertMenu2.accesskey "V">
-<!ENTITY tableDeleteMenu2.label "Zbriši tabelo">
+<!ENTITY tableDeleteMenu2.label "Izbriši tabelo">
 <!ENTITY tableDeleteMenu2.accesskey "Z">
 
 <!-- Insert SubMenu -->
 <!ENTITY tableInsertMenu.label "Vstavi">
 <!ENTITY tableInsertMenu.accesskey "V">
 <!ENTITY tableTable.label "Tabela">
 <!ENTITY tableTable.accesskey "T">
-<!ENTITY tableRow.label "Vrsta">
-<!ENTITY tableRows.label "Vrsta(e)">
+<!ENTITY tableRow.label "Vrstica">
+<!ENTITY tableRows.label "Vrstica(e)">
 <!ENTITY tableRow.accesskey "r">
 <!ENTITY tableRowAbove.label "Vrsta nad">
 <!ENTITY tableRowAbove.accesskey "n">
 <!ENTITY tableRowBelow.label "Vrsta pod">
 <!ENTITY tableRowBelow.accesskey "p">
 <!ENTITY tableColumn.label "Stolpec">
 <!ENTITY tableColumns.label "Stolpec(i)">
 <!ENTITY tableColumn.accesskey "o">
@@ -379,29 +310,26 @@
      But value must be set here for accesskey to draw properly
 -->
 <!ENTITY tableJoinCells.label "j">
 <!ENTITY tableJoinCells.accesskey "j">
 <!ENTITY tableSplitCell.label "Deli celico">
 <!ENTITY tableSplitCell.accesskey "D">
 <!ENTITY convertToTable.label "Ustvari tabelo iz izbire">
 <!ENTITY convertToTable.accesskey "U">
-<!ENTITY tableProperties.label "Nastavitve tabele …">
+<!ENTITY tableProperties.label "Lastnosti tabele …">
 <!ENTITY tableProperties.accesskey "N">
 
 <!-- Toolbar-only items -->
 <!ENTITY menuBar.tooltip "Vrstica z menijem">
 <!ENTITY formatToolbar.tooltip "Orodna vrstica za oblikovanje">
-<!ENTITY newToolbarCmd.tooltip "Ustvari novo stran v Composerju">
-<!ENTITY newToolbarCmd.label "Novo">
-<!ENTITY openToolbarCmd.label "Odpri">
-<!ENTITY openToolbarCmd.tooltip "Odpri lokalno datoteko">
-<!ENTITY saveToolbarCmd.tooltip "Shrani datoteko na lokalno mesto">
-<!ENTITY publishToolbarCmd.tooltip "Prenesi datoteko na oddaljeno mesto">
-<!ENTITY printToolbarCmd.label "Natisni ">
+<!ENTITY cutToolbarCmd.tooltip "Izreži">
+<!ENTITY copyToolbarCmd.tooltip "Kopiraj">
+<!ENTITY pasteToolbarCmd.tooltip "Prilepi">
+<!ENTITY printToolbarCmd.label "Tiskanje">
 <!ENTITY printToolbarCmd.tooltip "Natisni to stran">
 <!ENTITY findToolbarCmd.label "Poišči">
 <!ENTITY findToolbarCmd.tooltip "Poišči besedilo v strani">
 <!ENTITY spellToolbarCmd.label "Črkuj">
 <!ENTITY spellToolbarCmd.tooltip "Preveri črkovanje besedila v izbiri ali na celotni strani">
 <!ENTITY imageToolbarCmd.label "Slika">
 <!ENTITY imageToolbarCmd.tooltip "Vstavi novo sliko ali uredi lastnosti izbrane slike">
 <!ENTITY hruleToolbarCmd.label "Vod.črta">
@@ -440,14 +368,14 @@
 <!ENTITY structRemoveTag.label      "Odstrani oznako">
 <!ENTITY structRemoveTag.accesskey  "O">
 <!ENTITY structChangeTag.label      "Spremeni oznako">
 <!ENTITY structChangeTag.accesskey  "S">
 
 <!-- TOC manipulation -->
 <!ENTITY insertTOC.label          "Vstavi">
 <!ENTITY insertTOC.accesskey      "V">
-<!ENTITY updateTOC.label          "Obnovi">
+<!ENTITY updateTOC.label          "Posodobi">
 <!ENTITY updateTOC.accesskey      "b">
 <!ENTITY removeTOC.label          "Odstrani">
 <!ENTITY removeTOC.accesskey      "O">
 <!ENTITY tocMenu.label            "Kazalo vsebine">
 <!ENTITY tocMenu.accesskey        "K">
--- a/editor/ui/chrome/dialogs/EdDialogOverlay.dtd
+++ b/editor/ui/chrome/dialogs/EdDialogOverlay.dtd
@@ -33,19 +33,19 @@
    - the provisions above, a recipient may use your version of this file under
    - the terms of any one of the MPL, the GPL or the LGPL.
    -
    - ***** END LICENSE BLOCK ***** -->
 
 <!ENTITY AdvancedEditButton.label "Napredno spreminjanje …">
 <!ENTITY AdvancedEditButton.accessKey "N">
 <!ENTITY AdvancedEditButton.tooltip "Dodaj ali spremeni atribute HTML, slogovne atribute in JavaScript">
-<!ENTITY chooseFileButton.label "Izberi datoteko …">
+<!ENTITY chooseFileButton.label "Izberite datoteko …">
 <!ENTITY chooseFileButton.accessKey "I">
-<!ENTITY chooseFileLinkButton.label "Izberi datoteko …">
+<!ENTITY chooseFileLinkButton.label "Izberite datoteko …">
 <!ENTITY chooseFileLinkButton.accessKey "I">
 <!ENTITY makeUrlRelative.label "URL je relativen glede na lokacijo strani">
 <!ENTITY makeUrlRelative.accessKey "R">
 <!ENTITY makeUrlRelative.tooltip "Menjaj iz relativnega v absolutni URL in obratno. Stran morate najprej shraniti, potem šele lahko to spremenite.">
 
 <!-- Shared by Link and Image dialogs -->
-<!ENTITY LinkURLEditField.label "Vnesite lokacijo spletne strani, lokalne datoteke, ali pa izberite sidro z imenom oziroma naslov iz pojavnega seznama:">
+<!ENTITY LinkURLEditField.label "Vnesite lokacijo spletne strani, krajevne datoteke, ali pa izberite sidro z imenom oziroma naslov iz seznama:">
 <!ENTITY LinkURLEditField.accessKey "V">
--- a/editor/ui/chrome/dialogs/EditConflict.dtd
+++ b/editor/ui/chrome/dialogs/EditConflict.dtd
@@ -33,11 +33,11 @@
    - the provisions above, a recipient may use your version of this file under
    - the terms of any one of the MPL, the GPL or the LGPL.
    -
    - ***** END LICENSE BLOCK ***** -->
 
 <!-- Window title -->
 <!ENTITY windowTitle.label "Izberite spremembe zaradi urejanja">
 <!ENTITY conflictWarning.label "To stran je nek drugi program spremenil, poleg tega pa sprememb v Composerju še niste shranili.">
-<!ENTITY conflictResolve.label "Odločite se, katero od inačic želite zadržati:">
+<!ENTITY conflictResolve.label "Odločite se, katero od različic želite zadržati:">
 <!ENTITY keepCurrentPageButton.label "Ohrani spremembe trenutne strani">
 <!ENTITY useOtherPageButton.label "Zamenjaj trenutno stran z drugimi spremembami">
--- a/editor/ui/chrome/dialogs/EditorColorProperties.dtd
+++ b/editor/ui/chrome/dialogs/EditorColorProperties.dtd
@@ -38,17 +38,17 @@
 <!-- Window title -->
 <!ENTITY windowTitle.label "Barve strani in ozadja">
 <!ENTITY pageColors.label "Barve strani">
 <!ENTITY defaultColorsRadio.label "Privzete barve bralca (ne nastavlja barv za stran)">
 <!ENTITY defaultColorsRadio.accessKey "P">
 <!ENTITY defaultColorsRadio.tooltip "Uporabljaj samo barve, ki jih gledalec (bralec) uporablja v brskalniku">
 <!ENTITY customColorsRadio.label "Uporabi barve po meri:">
 <!ENTITY customColorsRadio.accessKey "M">
-<!ENTITY customColorsRadio.tooltip "Te barvne nastavitve nadomestijo vrednosti iz gledalčevega brskalnika">
+<!ENTITY customColorsRadio.tooltip "Te barvne nastavitve preglasijo vrednosti iz prikazovalnika v brskalniku">
 
 <!ENTITY normalText.label "Običajno besedilo">
 <!ENTITY normalText.accessKey "O">
 <!ENTITY linkText.label "Besedilo povezave">
 <!ENTITY linkText.accessKey "B">
 <!ENTITY activeLinkText.label "Besedilo aktivne povezave">
 <!ENTITY activeLinkText.accessKey "A">
 <!ENTITY visitedLinkText.label "Besedilo obiskane povezave">
--- a/editor/ui/chrome/dialogs/EditorHLineProperties.dtd
+++ b/editor/ui/chrome/dialogs/EditorHLineProperties.dtd
@@ -34,17 +34,17 @@
    - the terms of any one of the MPL, the GPL or the LGPL.
    -
    - ***** END LICENSE BLOCK ***** -->
 
 
 <!-- Window title -->
 <!ENTITY windowTitle.label "Lastnosti vodoravne črte">
 
-<!ENTITY dimensionsBox.label "Dimenzije">
+<!ENTITY dimensionsBox.label "Mere">
 <!ENTITY heightEditField.label "Višina:">
 <!ENTITY heightEditField.accessKey "V">
 <!ENTITY widthEditField.label "Dolžina:">
 <!ENTITY widthEditField.accessKey "D">
 <!ENTITY pixelsPopup.value "pik">
 <!ENTITY alignmentBox.label "Poravnava">
 <!ENTITY leftRadio.label "Levo">
 <!ENTITY leftRadio.accessKey "L">
--- a/editor/ui/chrome/dialogs/EditorImageProperties.dtd
+++ b/editor/ui/chrome/dialogs/EditorImageProperties.dtd
@@ -67,44 +67,45 @@
 <!ENTITY customSizeRadio.accessKey "M">
 <!ENTITY customSizeRadio.tooltip "Spremeni velikost slike na velikost prikaza na strani">
 <!ENTITY heightEditField.label "Višina:">
 <!ENTITY heightEditField.accessKey "V">
 <!ENTITY widthEditField.label "Dolžina:">
 <!ENTITY widthEditField.accessKey "D">
 <!ENTITY constrainCheckbox.label "Stisni">
 <!ENTITY constrainCheckbox.accessKey "S">
-<!ENTITY constrainCheckbox.tooltip "> Ohrani razmerje med dimenzijami slike">
+<!ENTITY constrainCheckbox.tooltip "Ohrani razmerje med dimenzijami slike">
 
 <!-- These controls are in the Image Map box of the expanded area -->
 <!ENTITY imagemapBox.label "Zemljevid slik">
 <!ENTITY removeImageMapButton.label "Odstrani">
 <!ENTITY removeImageMapButton.accessKey "O">
-<!ENTITY editImageMapButton.label "Urejaj …">
-<!ENTITY editImageMapButton.tooltip "Ustvari v tej sliki vroče točke za klikanje">
 
 <!-- These are the options for image alignment -->
 <!ENTITY alignment.label "Poravnaj besedilo na sliko">
 <!ENTITY bottomPopup.value "Na dnu">
 <!ENTITY topPopup.value "Na vrhu">
 <!ENTITY centerPopup.value "Na sredini">
 <!ENTITY wrapRightPopup.value "Oblij na desno">
 <!ENTITY wrapLeftPopup.value "Oblij na levo">
 
 <!-- These controls are in the Spacing Box -->
 <!ENTITY spacingBox.label "Razmik">
 <!ENTITY leftRightEditField.label "Levo in desno:">
 <!ENTITY leftRightEditField.accessKey "L">
 <!ENTITY topBottomEditField.label "Zgoraj in spodaj:">
-<!ENTITY topBottomEditField.accessKey "Z">
+<!ENTITY topBottomEditField.accessKey "Z">	
 <!ENTITY borderEditField.label "Neprekinjen rob:">
 <!ENTITY borderEditField.accessKey "N">
 
 <!-- These controls are in the Link Box -->
 <!ENTITY showImageLinkBorder.label "Pokaži rob okoli povezane strani">
 <!ENTITY showImageLinkBorder.accessKey "P">
+<!ENTITY LinkAdvancedEditButton.label "Napredno urejanje povezave…">
+<!ENTITY LinkAdvancedEditButton.accessKey "u">
+<!ENTITY LinkAdvancedEditButton.tooltip "Dodaj ali uredi prilastke za HTML in slog ter JavaScript">
 
 <!-- These tabs are currently used in the image input dialog -->
 <!ENTITY imageInputTab.label "Obrazec">
-<!ENTITY imageLocationTab.label "Kraj">
-<!ENTITY imageDimensionsTab.label "Dimenzije">
+<!ENTITY imageLocationTab.label "Položaj">
+<!ENTITY imageDimensionsTab.label "Mere">
 <!ENTITY imageAppearanceTab.label "Videz">
 <!ENTITY imageLinkTab.label "Povezava">
--- a/editor/ui/chrome/dialogs/EditorPageProperties.dtd
+++ b/editor/ui/chrome/dialogs/EditorPageProperties.dtd
@@ -42,9 +42,9 @@
 <!ENTITY titleInput.label "Naslov:">
 <!ENTITY titleInput.accessKey "R">
 <!ENTITY authorInput.label "Avtor:">
 <!ENTITY authorInput.accessKey "A">
 <!ENTITY descriptionInput.label "Opis:">
 <!ENTITY descriptionInput.accessKey "O">
 <!ENTITY locationNewPage.label "[Nova stran, še ni shranjena]">
 <!ENTITY EditHEADSource1.label "Napredni uporabniki:">
-<!ENTITY EditHEADSource2.label " Če želite urediti drugo vsebino področja za &lt;glavo&gt;, uporabite &quot;izvorno besedilo HTML &quot; v meniju Pogled ali v orodni vrstici za urejevalni način.">
+<!ENTITY EditHEADSource2.label "Če želite urediti drugo vsebino področja za &lt;glavo&gt;, uporabite &quot;izvorno besedilo HTML &quot; v meniju Pogled ali v orodni vrstici za urejevalni način.">
--- a/editor/ui/chrome/dialogs/EditorPublish.dtd
+++ b/editor/ui/chrome/dialogs/EditorPublish.dtd
@@ -63,18 +63,18 @@
 <!ENTITY otherDirList.tooltip         "Izberite ali vnesite ime oddaljenega podimenika, kamor naj se datoteke za objavo prenese">
 <!ENTITY pageTitle.label              "Naslov strani:">
 <!ENTITY pageTitle.accesskey          "R">
 <!ENTITY pageTitle.tooltip            "Vnesite naslov, ki bo označeval stran v oknu in v zaznamkih">
 <!ENTITY pageTitleExample.label       "npr.: &quot;Moja spletna stran&quot;">
 <!ENTITY filename.label               "Ime datoteke:">
 <!ENTITY filename.accesskey           "D">
 <!ENTITY filename.tooltip             "Vnesite ime za to datoteko, vključno s '.html' za spletno stran">
-<!ENTITY filenameExample.label        "npr,: &quot;mojastran.html&quot;">
-<!ENTITY setDefaultButton.label       "R">
+<!ENTITY filenameExample.label        "npr.: &quot;mojastran.html&quot;">
+<!ENTITY setDefaultButton.label       "Privzet račun">
 <!ENTITY setDefaultButton.accesskey   "D">
 <!ENTITY removeButton.label           "Odstrani stran">
 <!ENTITY removeButton.accesskey       "e">
 
 <!-- Settings Tab Panel -->
 <!ENTITY publishSites.label           "Spletišča za objavo">
 <!ENTITY serverInfo.label             "Podatki o strežniku">
 <!ENTITY loginInfo.label              "Podatki za login">
--- a/editor/ui/chrome/dialogs/EditorSpellCheck.dtd
+++ b/editor/ui/chrome/dialogs/EditorSpellCheck.dtd
@@ -54,17 +54,17 @@
 <!ENTITY replaceAllButton.label "Zamenjaj vse">
 <!ENTITY replaceAllButton.accessKey "a">
 <!ENTITY stopButton.label "Ustavi">
 <!ENTITY stopButton.accessKey "s">
 <!ENTITY userDictionary.label "Osebni slovar:">
 <!ENTITY moreDictionaries.label "Naloži dodatne slovarje …">
 <!ENTITY addToUserDictionaryButton.label "Dodaj besedo">
 <!ENTITY addToUserDictionaryButton.accessKey "p">
-<!ENTITY editUserDictionaryButton.label "Urejaj …">
+<!ENTITY editUserDictionaryButton.label "Urejanje …">
 <!ENTITY editUserDictionaryButton.accessKey "e">
 <!ENTITY recheckButton.label "Ponovno preglej stran">
 <!ENTITY recheckButton.accessKey "P">
 <!ENTITY closeButton.label "Zapri">
 <!ENTITY closeButton.accessKey "z">
 <!ENTITY sendButton.label "Pošlji">
 <!ENTITY sendButton.accessKey "P">
 <!ENTITY languagePopup.label "Jezik:">