update FENNEC_25_0b10_BUILD1 FENNEC_25_0b10_RELEASE FENNEC_25_0b2_BUILD1 FENNEC_25_0b2_RELEASE FENNEC_25_0b4_BUILD1 FENNEC_25_0b4_RELEASE FENNEC_25_0b6_BUILD1 FENNEC_25_0b6_RELEASE FENNEC_25_0b8_BUILD1 FENNEC_25_0b8_RELEASE THUNDERBIRD_25_0b1_BUILD1 THUNDERBIRD_25_0b1_RELEASE
authorsektormaster@atlas.sk
Mon, 12 Aug 2013 22:10:58 +0200
changeset 1048 24bb640dfc18236b8b66edbf1cabd66066d906a4
parent 1017 e54eec56bd6fcfb7b4f4459f5cc597a90f96e084
child 1049 194a7ceb1f0ad1781beb12ea9c207fdde7e00c94
child 1054 800809fb6f85dcedd1ddb3293ae926eab5a50582
child 1058 ac946aec269696d711ff740d2f9bcac5ca3c4c96
child 1060 17cefa48236c54251aad9c58490661577344fb23
child 1063 946dc260dc62233f3fff53639d696a2b76e10736
child 1065 485b62f8df7e3f2ee42760cebb8ea8c3bd8f4e14
child 1073 8c83c09330993970da83617ed401013d895d01eb
push id1
push usersledru@mozilla.com
push dateFri, 05 Dec 2014 02:19:11 +0000
update
browser/chrome/browser/baseMenuOverlay.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/netmonitor.dtd
browser/chrome/browser/devtools/profiler.dtd
browser/chrome/browser/devtools/profiler.properties
browser/chrome/browser/devtools/scratchpad.properties
browser/chrome/browser/devtools/styleeditor.properties
browser/chrome/browser/devtools/toolbox.dtd
browser/chrome/browser/newTab.dtd
browser/chrome/browser/pageInfo.dtd
browser/chrome/browser/pageInfo.properties
browser/chrome/browser/places/places.properties
browser/chrome/browser/preferences/aboutPermissions.properties
browser/chrome/browser/sitePermissions.properties
browser/chrome/browser/syncSetup.properties
dom/chrome/accessibility/AccessFu.properties
dom/chrome/dom/dom.properties
dom/chrome/layout/HtmlForm.properties
dom/chrome/layout/css.properties
dom/chrome/security/security.properties
extensions/irc/chrome/chatzilla.properties
mail/chrome/messenger/imapMsgs.properties
mail/chrome/messenger/localMsgs.properties
mail/chrome/messenger/messenger.dtd
mail/chrome/messenger/messenger.properties
mobile/android/base/android_strings.dtd
mobile/android/chrome/aboutAddons.properties
mobile/android/chrome/aboutDownloads.properties
mobile/android/chrome/aboutFeedback.dtd
mobile/android/chrome/browser.properties
suite/chrome/browser/region.properties
suite/chrome/browser/webDeveloper.dtd
suite/chrome/common/contentAreaCommands.dtd
suite/chrome/common/help/mailnews_organizing.xhtml
suite/chrome/common/pref/pref-certs.dtd
suite/chrome/common/pref/pref-validation.dtd
suite/chrome/common/pref/preferences.dtd
suite/chrome/common/utilityOverlay.dtd
suite/chrome/mailnews/SearchDialog.dtd
suite/chrome/mailnews/imapMsgs.properties
suite/chrome/mailnews/localMsgs.properties
suite/chrome/mailnews/messenger.dtd
toolkit/chrome/global/findbar.dtd
toolkit/chrome/global/findbar.properties
toolkit/chrome/global/resetProfile.properties
toolkit/chrome/mozapps/extensions/extensions.properties
toolkit/chrome/mozapps/plugins/plugins.dtd
toolkit/chrome/places/places.properties
--- a/browser/chrome/browser/baseMenuOverlay.dtd
+++ b/browser/chrome/browser/baseMenuOverlay.dtd
@@ -14,16 +14,20 @@
                        for the help button in the menubar but Gnome does not.   -->
 <!ENTITY helpMenuWin.label        "Pomocník">
 <!ENTITY helpMenuWin.accesskey    "P">
 <!ENTITY aboutProduct.label       "O prehliadači &brandShortName;">
 <!ENTITY aboutProduct.accesskey   "O">
 <!ENTITY productHelp.label        "Pomocník prehliadača &brandShortName;">
 <!ENTITY productHelp.accesskey    "P">
 <!ENTITY helpMac.commandkey       "?">
+
+<!ENTITY helpKeyboardShortcuts.label     "Klávesové skratky">
+<!ENTITY helpKeyboardShortcuts.accesskey "K">
+
 <!ENTITY helpSafeMode.label       "Reštartovať a zakázať doplnky…">
 <!ENTITY helpSafeMode.accesskey   "R">
 
 <!ENTITY healthReport.label       "Správa o kondícii prehliadača &brandShortName;">
 <!ENTITY healthReport.accesskey   "S">
 
 <!ENTITY helpTroubleshootingInfo.label      "Informácie pre riešenie problémov">
 <!ENTITY helpTroubleshootingInfo.accesskey  "n">
--- a/browser/chrome/browser/browser.dtd
+++ b/browser/chrome/browser/browser.dtd
@@ -41,16 +41,21 @@ can reach it easily. -->
 <!ENTITY  moveToGroup.accesskey              "P">
 <!ENTITY  moveToNewGroup.label               "Nová skupina">
 <!ENTITY  moveToNewWindow.label              "Presunúť do nového okna">
 <!ENTITY  moveToNewWindow.accesskey          "k">
 <!ENTITY  bookmarkAllTabs.label              "Pridať všetky karty medzi záložky…">
 <!ENTITY  bookmarkAllTabs.accesskey          "v">
 <!ENTITY  undoCloseTab.label                 "Obnoviť zatvorenú kartu">
 <!ENTITY  undoCloseTab.accesskey             "a">
+<!-- LOCALIZATION NOTE (undoCloseTabs.label) : This label is used
+when the previous tab-closing operation closed more than one tab. It
+replaces the undoCloseTab.label and will use the same accesskey as the
+undoCloseTab.label so users will not need to learn new keyboard controls. -->
+<!ENTITY  undoCloseTabs.label                "Obnoviť zatvorené karty">
 <!ENTITY  closeTab.label                     "Zavrieť kartu">
 <!ENTITY  closeTab.accesskey                 "Z">
 
 <!ENTITY  listAllTabs.label      "Zoznam všetkých kariet">
 
 <!ENTITY tabCmd.label "Nová karta">
 <!ENTITY tabCmd.accesskey "a">
 <!ENTITY tabCmd.commandkey "t">
@@ -102,19 +107,18 @@ These should match what Safari and other
 <!ENTITY fullScreenRestore.tooltip "Obnoviť">
 <!ENTITY fullScreenClose.tooltip "Zavrieť">
 <!ENTITY fullScreenAutohide.label "Skryť panely s nástrojmi">
 <!ENTITY fullScreenAutohide.accesskey "k">
 <!ENTITY fullScreenExit.label "Ukončiť režim Na celú obrazovku">
 <!ENTITY fullScreenExit.accesskey "U">
 <!ENTITY fullscreenAllowButton.label "Povoliť">
 <!ENTITY fullscreenExitButton.label "Zakázať">
-<!ENTITY fullscreenApproval.value "Povoliť režim Na celú obrazovku?">
 
-<!ENTITY fullscreenExitHint.value "Stlačením klávesu ESC opustíte režim Na celú obrazovku.">
+<!ENTITY fullscreenExitHint2.value "Stlačením klávesu ESC opustíte režim.">
 <!ENTITY leaveDOMFullScreen.label "Ukončiť režim Na celú obrazovku">
 <!ENTITY leaveDOMFullScreen.accesskey "U">
 
 <!ENTITY closeWindow.label "Zavrieť okno">
 <!ENTITY closeWindow.accesskey "v">
 
 <!ENTITY bookmarksMenu.label "Záložky">
 <!ENTITY bookmarksMenu.accesskey "o">
@@ -195,30 +199,32 @@ These should match what Safari and other
 <!ENTITY historyButton.tooltip         "Zobraziť naposledy prezerané stránky">
 <!ENTITY historySidebarCmd.commandKey  "h">
 
 <!ENTITY toolsMenu.label               "Nástroje">
 <!ENTITY toolsMenu.accesskey           "N">
 
 <!ENTITY keywordfield.label "Pridať kľúčové slovo pre toto vyhľadávanie…">
 <!ENTITY keywordfield.accesskey "d">
-<!ENTITY search.label "Vyhľadávanie na webe">
-<!ENTITY search.accesskey "V">
+
 <!ENTITY downloads.label "Správca preberania súborov">
 <!ENTITY downloads.tooltip "Zobraziť stav preberania súborov">
 <!ENTITY downloads.accesskey "S">
 <!ENTITY downloads.commandkey "j">
 <!ENTITY downloadsUnix.commandkey "y">
 <!ENTITY addons.label                 "Doplnky">
 <!ENTITY addons.accesskey             "D">
 <!ENTITY addons.commandkey            "A">
 
 <!ENTITY webDeveloperMenu.label       "Webový vývojár">
 <!ENTITY webDeveloperMenu.accesskey   "W">
 
+<!ENTITY devToolsCmd.keycode          "VK_F12">
+<!ENTITY devToolsCmd.keytext          "F12">
+
 <!ENTITY devtoolsConnect.label        "Pripojiť…">
 <!ENTITY devtoolsConnect.accesskey    "P">
 
 <!ENTITY errorConsoleCmd.label        "Chybová konzola">
 <!ENTITY errorConsoleCmd.accesskey    "C">
 
 <!ENTITY remoteWebConsoleCmd.label    "Vzdialená webová konzola">
 
@@ -254,16 +260,18 @@ These should match what Safari and other
 
 <!ENTITY devToolbarCloseButton.tooltiptext "Zavrieť panel nástrojov Vývojár">
 <!ENTITY devToolbarMenu.label "Panel nástrojov Vývojár">
 <!ENTITY devToolbarMenu.accesskey          "V">
 <!ENTITY devToolbar.keycode                "VK_F2">
 <!ENTITY devToolbar.keytext                "F2">
 <!ENTITY devToolboxMenuItem.label          "Prepnúť vývojárske nástroje">
 <!ENTITY devToolboxMenuItem.accesskey      "P">
+<!ENTITY devToolboxMenuItem.keycode        "I">
+<!ENTITY devToolboxMenuItem.keytext        "I">
 
 <!ENTITY devToolbarToolsButton.tooltip     "Prepnúť vývojárske nástroje">
 <!ENTITY devToolbarOtherToolsButton.label  "Ďalšie nástroje">
 
 <!ENTITY getMoreDevtoolsCmd.label        "Získať ďalšie nástroje">
 <!ENTITY getMoreDevtoolsCmd.accesskey    "Z">
 
 <!ENTITY fileMenu.label "Súbor">
@@ -321,17 +329,16 @@ These should match what Safari and other
 
 <!ENTITY historyMenu.label "História">
 <!ENTITY historyMenu.accesskey "H">
 <!ENTITY historyUndoMenu.label "Nedávno zatvorené karty">
 <!-- LOCALIZATION NOTE (historyUndoWindowMenu): see bug 394759 -->
 <!ENTITY historyUndoWindowMenu.label "Nedávno zatvorené okná">
 <!ENTITY historyRestoreLastSession.label "Obnoviť predchádzajúcu reláciu">
 
-<!ENTITY historyHomeCmd.label "Domov">
 <!ENTITY showAllHistoryCmd2.label "Zobraziť celú históriu">
 <!ENTITY showAllHistoryCmd.commandkey "H">
 
 <!ENTITY appMenuEdit.label "Úpravy">
 <!ENTITY appMenuCustomize.label "Prispôsobenie">
 <!ENTITY appMenuToolbarLayout.label "Rozloženie panela nástrojov…">
 <!ENTITY appMenuSidebars.label "Bočné panely">
 <!ENTITY appMenuFind.label "Hľadať…">
@@ -402,16 +409,18 @@ These should match what Safari and other
 <!ENTITY viewFrameInfoCmd.label       "Zobraziť informácie o rámci">
 <!ENTITY viewFrameInfoCmd.accesskey   "i">
 <!ENTITY reloadImageCmd.label         "Znova načítať obrázok">
 <!ENTITY reloadImageCmd.accesskey     "t">
 <!ENTITY viewImageCmd.label           "Zobraziť obrázok">
 <!ENTITY viewImageCmd.accesskey       "b">
 <!ENTITY viewImageInfoCmd.label       "Zobraziť informácie o obrázku">
 <!ENTITY viewImageInfoCmd.accesskey   "f">
+<!ENTITY viewImageDescCmd.label       "Zobraziť popis">
+<!ENTITY viewImageDescCmd.accesskey   "s">
 <!ENTITY viewVideoCmd.label           "Zobraziť video">
 <!ENTITY viewVideoCmd.accesskey       "b">
 <!ENTITY viewBGImageCmd.label         "Zobraziť obrázok pozadia">
 <!ENTITY viewBGImageCmd.accesskey     "b">
 <!ENTITY setDesktopBackgroundCmd.label "Nastaviť ako pozadie pracovnej plochy…">
 <!ENTITY setDesktopBackgroundCmd.accesskey "N">
 <!ENTITY bookmarkPageCmd2.label       "Vytvoriť záložku pre túto stránku">
 <!ENTITY bookmarkPageCmd2.accesskey   "z">
@@ -616,16 +625,18 @@ Example Enterprises, Inc.
 The layout of the identity dialog prevents combining this into a single string with
 substitution variables.  If it is difficult to translate the sense of the string
 with that structure, consider a translation which ignores the preceding domain and
 just addresses the organization to follow, e.g. "This site is run by " -->
 <!ENTITY identity.runBy "Spravuje ju">
 
 <!ENTITY identity.moreInfoLinkText "Ďalšie informácie…">
 
+<!ENTITY identity.permissions "Povolenia">
+
 <!-- 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 "Karty prehliadača">
 
 <!-- LOCALIZATION NOTE (syncTabsMenu.label): This appears in the history menu -->
 <!ENTITY syncTabsMenu2.label "Karty z ďalších zariadení">
 
 <!ENTITY syncBrand.shortName.label    "Sync">
--- a/browser/chrome/browser/browser.properties
+++ b/browser/chrome/browser/browser.properties
@@ -26,27 +26,27 @@ xpinstallPromptAllowButton=Povoliť
 # See http://www.mozilla.org/access/keyboard/accesskey for details
 xpinstallPromptAllowButton.accesskey=v
 xpinstallDisabledMessageLocked=Inštalácia softvéru bola vypnutá vašim správcom systému.
 xpinstallDisabledMessage=Inštalácia softvéru je momentálne vypnutá. Kliknite na tlačidlo Povoliť a skúste to znova.
 xpinstallDisabledButton=Povoliť
 xpinstallDisabledButton.accesskey=v
 
 # LOCALIZATION NOTE (addonDownloading, addonDownloadCancelled, addonDownloadRestart):
-# Semi-colon list of plural forms. See:
+# Semicolon-separated 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
 addonDownloading=Preberá sa doplnok;Preberajú sa doplnky;Preberajú sa doplnky
 addonDownloadCancelled=Preberanie doplnku zrušené.;Preberanie doplnkov zrušené.;Preberanie doplnkov zrušené.
 addonDownloadRestart=Obnoviť preberanie;Obnoviť preberanie;Obnoviť preberanie
 addonDownloadRestart.accessKey=O
 addonDownloadCancelTooltip=Zrušiť
 
 # LOCALIZATION NOTE (addonsInstalled, addonsInstalledNeedsRestart):
-# Semi-colon list of plural forms. See:
+# Semicolon-separated list of plural forms. See:
 # http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # #1 first add-on's name, #2 number of add-ons, #3 application name
 addonsInstalled=Doplnok #1 bol úspešne nainštalovaný.;Úspešne boli nainštalované #2 doplnky.;Úspešne bolo nainštalovaných #2 doplnkov.
 addonsInstalledNeedsRestart=Doplnok #1 bude nainštalovaný po reštartovaní prehliadača #3.;Po reštartovaní prehliadača #3 budú nainštalované #2 doplnky.;Po reštartovaní prehliadača #3 bude nainštalovaných #2 doplnkov.
 addonInstallRestartButton=Reštartovať
 addonInstallRestartButton.accesskey=R
 
 # LOCALIZATION NOTE (addonError-1, addonError-2, addonError-3, addonError-4):
@@ -80,16 +80,17 @@ lwthemePostInstallNotification.manageBut
 
 # LOCALIZATION NOTE (lwthemeNeedsRestart.message):
 # %S will be replaced with the new theme name.
 lwthemeNeedsRestart.message=Téma %S bude nainštalovaná po reštarte.
 lwthemeNeedsRestart.button=Reštartovať
 lwthemeNeedsRestart.accesskey=R
 
 # LOCALIZATION NOTE (popupWarning.message): Semicolon-separated list of plural forms.
+# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # #1 is brandShortName and #2 is the number of pop-ups blocked.
 popupWarning.message=#1 zabránil tejto stránke v otvorení vyskakovacieho okna.;#1 zabránil tejto stránke v otvorení #2 vyskakovacích okien.;#1 zabránil tejto stránke v otvorení #2 vyskakovacích okien.
 popupWarningButton=Možnosti
 popupWarningButton.accesskey=M
 popupWarningButtonUnix=Možnosti
 popupWarningButtonUnix.accesskey=M
 popupAllow=Povoliť vyskakovacie okná z %S
 popupBlock=Blokovať vyskakovacie okná z %S
@@ -206,17 +207,17 @@ feedShowFeedNew=Prihlásiť sa k odberu kanála %S…
 
 menuOpenAllInTabs.label=Otvoriť všetko na kartách
 
 # History menu
 menuRestoreAllTabs.label=Obnoviť všetky karty
 # LOCALIZATION NOTE (menuRestoreAllWindows, menuUndoCloseWindowLabel, menuUndoCloseWindowSingleTabLabel):
 # see bug 394759
 menuRestoreAllWindows.label=Obnoviť všetky okná
-# LOCALIZATION NOTE (menuUndoCloseWindowLabel): Semi-colon list of plural forms.
+# LOCALIZATION NOTE (menuUndoCloseWindowLabel): Semicolon-separated list of plural forms.
 # See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # #1 Window Title, #2 Number of tabs
 menuUndoCloseWindowLabel=#1 (a ďalšia karta);#1 (a ďalšie #2 karty);#1 (a ďalších #2 kariet)
 menuUndoCloseWindowSingleTabLabel=#1
 
 # Unified Back-/Forward Popup
 tabHistory.current=Zostať na tejto stránke
 tabHistory.goBack=Prejsť späť na túto stránku
@@ -251,33 +252,38 @@ offlineApps.manageUsageAccessKey=Z
 # LOCALIZATION NOTE (indexedDB.usage): %1$S is the website host name
 # %2$S a number of megabytes.
 indexedDB.usage=Táto webová stránka (%1$S) sa pokúša uložiť viac ako %2$S MB údajov na použitie v režime offline.
 
 identity.identified.verifier=Overil ju %S
 identity.identified.verified_by_you=Pre túto stránku ste pridali bezpečnostnú výnimku.
 identity.identified.state_and_country=%S, %S
 
-identity.encrypted=Pripojenie k tejto stránke je z dôvodu ochrany pred sledovaním zabezpečené.
+identity.encrypted2=Pripojenie k tejto webovej stránke je zabezpečené.
+identity.mixed_display_loaded=Pripojenie k tejto webovej stránke nie je úplne zabezpečené, pretože stránka obsahuje nezašifrované prvky (ako napríklad obrázky).
+identity.mixed_display_loaded_active_blocked=Interaktívny obsah (ako napríklad skripty), ktorý nie je zašifrovaný, bol kvôli Vašej ochrane zablokovaný.
+identity.mixed_active_loaded2=Táto webová stránka obsahuje interaktívny obsah, ktorý nie je zašifrovaný (ako napríklad skripty). Iní ľudia môžu zobraziť vaše údaje alebo zmeniť správanie stránky.
 identity.unencrypted=Pripojenie k tejto stránke nie je zabezpečené.
-identity.mixed_content=Pripojenie k tejto stránke je len čiastočne zabezpečené a neochraňuje tak pred možným sledovaním.
 
 identity.unknown.tooltip=Táto webová stránka neposkytuje informácie o identite
 
 identity.ownerUnknown2=(neznámy)
 
+# LOCALIZATION NOTE (identity.chrome): %S is replaced with the brandShortName.
+identity.chrome=Toto je bezpečná stránka prehliadača %S.
+
 # Edit Bookmark UI
 editBookmarkPanel.pageBookmarkedTitle=Stránka pridaná medzi záložky
 editBookmarkPanel.pageBookmarkedDescription=%S si bude túto stránku pamätať.
 editBookmarkPanel.bookmarkedRemovedTitle=Záložka odstránená
 editBookmarkPanel.editBookmarkTitle=Upraviť túto záložku
 
-# LOCALIZATION NOTE (editBookmark.removeBookmarks.label)
-# Semi-colon list of plural forms. Replacement for #1 is
-# the number of bookmarks to be removed.
+# LOCALIZATION NOTE (editBookmark.removeBookmarks.label): Semicolon-separated list of plural forms.
+# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
+# 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=Odstrániť záložku;Odstrániť #1 záložky;Odstrániť #1 záložiek
 
 # Post Update Notifications
 pu.notifyButton.label=Podrobnosti…
 pu.notifyButton.accesskey=d
 # LOCALIZATION NOTE %S will be replaced by the short name of the application.
@@ -341,17 +347,17 @@ ctrlTab.showAll.label=;Zobraziť všetky #1 karty;Zobraziť všetkých #1 kariet
 
 # LOCALIZATION NOTE (addKeywordTitleAutoFill): %S will be replaced by the page's title
 # Used as the bookmark name when saving a keyword for a search field.
 addKeywordTitleAutoFill=Vyhľadávanie na %S
 
 # TabView
 # LOCALIZATION NOTE (tabview.title): %S is the application name.
 tabview.title=Skupiny kariet prehliadača %S
-# LOCALIZATION NOTE (tabview.moveToUnnamedGroup.label): Semi-colon list of plural forms.
+# LOCALIZATION NOTE (tabview.moveToUnnamedGroup.label): Semicolon-separated list of plural forms.
 # See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # #1 is the page title of the first tab in the unnamed group, 
 # #2 is the number of remaining tabs.
 tabview.moveToUnnamedGroup.label=#1 a 1 ďalšia;#1 a #2 ďalšie;#1 a #2 ďalších
 
 extensions.{972ce4c6-7e08-4474-a285-3208198ce6fd}.name=Predvolená
 extensions.{972ce4c6-7e08-4474-a285-3208198ce6fd}.description=Predvolená téma
 
@@ -456,17 +462,17 @@ identity.next.accessKey = a
 # LOCALIZATION NOTE: shown in the popup notification when a user successfully logs into a website
 # LOCALIZATION NOTE (identity.loggedIn.description): %S is the user's identity (e.g. user@example.com)
 identity.loggedIn.description = Prihlásený ako: %S
 identity.loggedIn.signOut.label = Odhlásiť sa
 identity.loggedIn.signOut.accessKey = O
 
 # LOCALIZATION NOTE (getUserMedia.shareCamera.message, getUserMedia.shareMicrophone.message, getUserMedia.shareCameraAndMicrophone.message): %S is the website origin (e.g. www.mozilla.org)
 # LOCALIZATION NOTE (getUserMedia.shareSelectedDevices.label):
-# Semi-colon list of plural forms. See:
+# Semicolon-separated list of plural forms. See:
 # http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # The number of devices can be either one or two.
 getUserMedia.shareCamera.message = Chcete zdieľať svoju kameru so stránkou %S?
 getUserMedia.shareMicrophone.message = Chcete zdieľať svoj mikrofón so stránkou %S?
 getUserMedia.shareCameraAndMicrophone.message = Chcete zdieľať svoj mikrofón a kameru so stránkou %S?
 getUserMedia.noVideo.label = Žiadne video
 getUserMedia.noAudio.label = Žiadny zvuk
 getUserMedia.shareSelectedDevices.label = Zdieľať zvolené zariadenie;Zdieľať zvolené zariadenia;Zdieľať zvolené zariadenia
--- a/browser/chrome/browser/devtools/debugger.dtd
+++ b/browser/chrome/browser/devtools/debugger.dtd
@@ -14,16 +14,26 @@
 <!-- LOCALIZATION NOTE (debuggerUI.closeButton.tooltip): This is the tooltip for
   -  the button that closes the debugger UI. -->
 <!ENTITY debuggerUI.closeButton.tooltip "Zavrieť">
 
 <!-- LOCALIZATION NOTE (debuggerUI.panesButton.tooltip): This is the tooltip for
   -  the button that toggles the panes visible or hidden in the debugger UI. -->
 <!ENTITY debuggerUI.panesButton.tooltip "Prepnúť panely">
 
+<!-- LOCALIZATION NOTE (debuggerUI.blackBoxMessage.label): This is the message
+  - displayed to users when they select a black boxed source from the sources
+  - list in the debugger. -->
+<!ENTITY debuggerUI.blackBoxMessage.label "Tento zdroj je black boxe: jeho body prerušenia sú zakázané a krokovanie cez neho preskočí.">
+
+<!-- LOCALIZATION NOTE (debuggerUI.blackBoxMessage.unBlackBoxButton): This is
+  - the text displayed in the button to stop black boxing the currently selected
+  - source. -->
+<!ENTITY debuggerUI.blackBoxMessage.unBlackBoxButton "Zastaví black boxing tohto zdroja">
+
 <!-- LOCALIZATION NOTE (debuggerUI.optsButton.tooltip): This is the tooltip for
   -  the button that opens up an options context menu for the debugger UI. -->
 <!ENTITY debuggerUI.optsButton.tooltip  "Možnosti ladenia">
 
 <!-- LOCALIZATION NOTE (debuggerUI.pauseExceptions): This is the label for the
   -  checkbox that toggles pausing on exceptions. -->
 <!ENTITY debuggerUI.pauseExceptions     "Pozastaviť na výnimkách">
 <!ENTITY debuggerUI.pauseExceptions.key "P">
@@ -46,19 +56,19 @@
 <!ENTITY debuggerUI.showOnlyEnum.key    "t">
 
 <!-- LOCALIZATION NOTE (debuggerUI.showOriginalSource): This is the label for
   -  the checkbox that toggles the display of original or sourcemap-derived
   -  sources. -->
 <!ENTITY debuggerUI.showOriginalSource      "Zobraziť pôvodné zdroje">
 <!ENTITY debuggerUI.showOriginalSource.key  "o">
     
-<!-- LOCALIZATION NOTE (debuggerUI.searchPanelTitle): This is the text that
-  -  appears in the filter panel popup as a description. -->
-<!ENTITY debuggerUI.searchPanelTitle    "Operátory">
+<!-- LOCALIZATION NOTE (debuggerUI.searchPanelOperators): This is the text that
+  -  appears in the filter panel popup as a header for the operators part. -->
+<!ENTITY debuggerUI.searchPanelOperators    "Operátory:">
 
 <!-- LOCALIZATION NOTE (debuggerUI.searchFile): This is the text that appears
   -  in the source editor's context menu for the scripts search operation. -->
 <!ENTITY debuggerUI.searchFile          "Filtrovať skripty">
 <!ENTITY debuggerUI.searchFile.key      "s">
 <!ENTITY debuggerUI.searchFile.altkey   "O">
 
 <!-- LOCALIZATION NOTE (debuggerUI.searchGlobal): This is the text that appears
@@ -71,20 +81,20 @@
 <!ENTITY debuggerUI.searchFunction      "Vyhľadať definíciu funkcie">
 <!ENTITY debuggerUI.searchFunction.key  "f">
 
 <!-- LOCALIZATION NOTE (debuggerUI.searchToken): This is the text that appears
   -  in the source editor's context menu for the token search operation. -->
 <!ENTITY debuggerUI.searchToken         "Hľadať">
 <!ENTITY debuggerUI.searchToken.key     "H">
 
-<!-- LOCALIZATION NOTE (debuggerUI.searchLine): This is the text that appears
+<!-- LOCALIZATION NOTE (debuggerUI.searchGoToLine): This is the text that appears
   -  in the source editor's context menu for the line search operation. -->
-<!ENTITY debuggerUI.searchLine          "Prejsť na riadok…">
-<!ENTITY debuggerUI.searchLine.key      "e">
+<!ENTITY debuggerUI.searchGoToLine      "Prejsť na riadok…">
+<!ENTITY debuggerUI.searchGoToLine.key  "e">
 
 <!-- LOCALIZATION NOTE (debuggerUI.searchVariable): This is the text that appears
   -  in the source editor's context menu for the variables search operation. -->
 <!ENTITY debuggerUI.searchVariable      "Filtrovať premenné">
 <!ENTITY debuggerUI.searchVariable.key  "F">
 
 <!-- LOCALIZATION NOTE (debuggerUI.focusVariables): This is the text that appears
   -  in the source editor's context menu for the variables focus operation. -->
@@ -119,12 +129,16 @@
 <!-- LOCALIZATION NOTE (debuggerUI.removeWatch): This is the text that
   -  appears in the watch expressions context menu for removing all expressions. -->
 <!ENTITY debuggerUI.removeAllWatch      "Odstrániť všetky výrazy sledovania">
 <!ENTITY debuggerUI.removeAllWatch.key  "d">
 
 <!-- LOCALIZATION NOTE (debuggerUI.stepping): These are the keycodes that
   -  control the stepping commands in the debugger (continue, step over,
   -  step in and step out). -->
-<!ENTITY debuggerUI.stepping.resume     "VK_F6">
-<!ENTITY debuggerUI.stepping.stepOver   "VK_F7">
-<!ENTITY debuggerUI.stepping.stepIn     "VK_F8">
-<!ENTITY debuggerUI.stepping.stepOut    "VK_F8">
+<!ENTITY debuggerUI.stepping.resume1    "VK_F8">
+<!ENTITY debuggerUI.stepping.resume2    "VK_SLASH">
+<!ENTITY debuggerUI.stepping.stepOver1  "VK_F10">
+<!ENTITY debuggerUI.stepping.stepOver2  "VK_QUOTE">
+<!ENTITY debuggerUI.stepping.stepIn1    "VK_F11">
+<!ENTITY debuggerUI.stepping.stepIn2    "VK_SEMICOLON">
+<!ENTITY debuggerUI.stepping.stepOut1   "VK_F11">
+<!ENTITY debuggerUI.stepping.stepOut2   "VK_SEMICOLON">
--- a/browser/chrome/browser/devtools/debugger.properties
+++ b/browser/chrome/browser/devtools/debugger.properties
@@ -60,52 +60,61 @@ noGlobalsText=Žiadne chrome globals
 # LOCALIZATION NOTE (noMatchingGlobalsText): The text to display in the
 # menulist when there are no matching chrome globals after filtering.
 noMatchingGlobalsText=Žiadne nájdené chrome globals
 
 # LOCALIZATION NOTE (noSourcesText): The text to display in the sources menu
 # when there are no scripts.
 noSourcesText=Táto stránka nemá zdroje.
 
+# LOCALIZATION NOTE (blackBoxCheckboxTooltip) = The tooltip text to display when
+# the user hovers over the checkbox used to toggle black boxing its associated
+# source.
+blackBoxCheckboxTooltip=Prepnúť black boxing
+
 # LOCALIZATION NOTE (noMatchingSourcesText): The text to display in the
 # sources menu when there are no matching scripts after filtering.
 noMatchingSourcesText=Žiadne nájdené zdroje
 
 # LOCALIZATION NOTE (noMatchingStringsText): The text to display in the
 # global search results when there are no matching strings after filtering.
 noMatchingStringsText=Neboli nájdené žiadne zhody
 
-# LOCALIZATION NOTE (emptyChromeGlobalsFilterText): This is the text that
+# LOCALIZATION NOTE (emptySearchText): This is the text that appears in the
 # appears in the filter text box when it is empty and the chrome globals
 # container is selected.
-emptyFilterText=Filtrovať skripty (%S)
+emptySearchText=Prehľadávať skripty (%S)
 
-# LOCALIZATION NOTE (emptyFilterText): This is the text that appears in the
+# LOCALIZATION NOTE (emptyChromeGlobalsFilterText): This is the text that
 # filter text box when it is empty and the chrome globals container is selected.
 emptyChromeGlobalsFilterText=Filtrovať chrome globals (%S)
 
 # LOCALIZATION NOTE (emptyVariablesFilterText): This is the text that
 # appears in the filter text box for the variables view container.
 emptyVariablesFilterText=Filtrovať premenné
 
+# LOCALIZATION NOTE (searchPanelFilter): This is the text that appears in the
+# filter panel popup for the filter scripts operation.
+searchPanelFilter=Filtrovať skripty (%S)
+
 # LOCALIZATION NOTE (searchPanelGlobal): This is the text that appears in the
 # filter panel popup for the global search operation.
 searchPanelGlobal=Hľadať vo všetkých súboroch (%S)
 
 # LOCALIZATION NOTE (searchPanelFunction): This is the text that appears in the
 # filter panel popup for the function search operation.
 searchPanelFunction=Hľadať definíciu funkcie (%S)
 
 # LOCALIZATION NOTE (searchPanelToken): This is the text that appears in the
 # filter panel popup for the token search operation.
 searchPanelToken=Hľadať v tomto súbore (%S)
 
-# LOCALIZATION NOTE (searchPanelLine): This is the text that appears in the
+# LOCALIZATION NOTE (searchPanelGoToLine): This is the text that appears in the
 # filter panel popup for the line search operation.
-searchPanelLine=Prejsť na riadok (%S)
+searchPanelGoToLine=Prejsť na riadok (%S)
 
 # LOCALIZATION NOTE (searchPanelVariable): This is the text that appears in the
 # filter panel popup for the variables search operation.
 searchPanelVariable=Filtrovať premenné (%S)
 
 # LOCALIZATION NOTE (breakpointMenuItem): The text for all the elements that
 # are displayed in the breakpoints menu item popup.
 breakpointMenuItem.setConditional=Nastaviť podmienený bod prerušenia
--- a/browser/chrome/browser/devtools/gcli.properties
+++ b/browser/chrome/browser/devtools/gcli.properties
@@ -6,513 +6,325 @@
 # 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.
+# For each command there are in general two strings. As an example consider
+# the 'pref' command.
+# commandDesc (e.g. prefDesc for the command 'pref'): this string contains a
+# very short description of the command. It's designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+# commandManual (e.g. prefManual for the command 'pref'): this string will
+# contain a fuller description of the command. It's diplayed when the user
+# asks for help about a specific command (e.g. 'help pref').
+
+# LOCALIZATION NOTE: This message is used to describe any command or command
+# parameter when no description has been provided.
 canonDescNone=(bez popisu)
 
-# LOCALIZATION NOTE (canonDefaultGroupName): The default name for a group of
-# parameters.
+# LOCALIZATION NOTE: The default name for a group of parameters.
 canonDefaultGroupName=Možnosti
 
-# LOCALIZATION NOTE (canonProxyDesc): A very short description of a set of
-# remote commands. 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
-# canonProxyManual for a fuller description of what it does.
+# LOCALIZATION NOTE (canonProxyDesc, canonProxyManual): These commands are
+# used to execute commands on a remote system (using a proxy). Parameters: %S
+# is the name of the remote system.
 canonProxyDesc=Vykoná príkaz na %S
-
-# LOCALIZATION NOTE (canonProxyManual): A fuller description of a set of
-# remote commands. Displayed when the user asks for help on what it does.
 canonProxyManual=Sada príkazov, ktoré sú vykonávané na vzdialenom systéme. Vzdialený systém je pripojený cez %S
 
-# LOCALIZATION NOTE (canonProxyExists): An error message displayed when we try
-# to add new command (via a proxy) where one already exists in that name.
-canonProxyExists=Už existuje príkaz nazvaný '%S'
+# LOCALIZATION NOTE: This error message is displayed when we try to add a new
+# command (using a proxy) where one already exists with the same name.
+canonProxyExists=Príkaz '%S' už existuje.
 
-# LOCALIZATION NOTE (cliEvalJavascript): The special '{' command allows entry
-# of JavaScript like traditional developer tool command lines. This describes
-# the '{' command.
-cliEvalJavascript=Vojsť priamo do JavaScriptu
+# LOCALIZATION NOTE: This message describes the '{' command, which allows
+# entry of JavaScript like traditional developer tool command lines.
+cliEvalJavascript=Vojde priamo do JavaScriptu
 
-# LOCALIZATION NOTE (cliUnusedArg): When the command line has more arguments
-# than the current command can understand this is the error message shown to
-# the user.
+# LOCALIZATION NOTE: This message is displayed when the command line has more
+# arguments than the current command can understand.
 cliUnusedArg=Príliš veľa parametrov
 
-# LOCALIZATION NOTE (cliOptions): The title of the dialog which displays the
-# options that are available to the current command.
+# LOCALIZATION NOTE: The title of the dialog which displays the options that
+# are available to the current command.
 cliOptions=Dostupné možnosti
 
-# 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.
+# LOCALIZATION NOTE: Error message given when a file argument points to a file
+# that does not exist, but should (e.g. for use with File->Open) %1$S is a
+# filename
+fileErrNotExists=Súbor '%1$S' neexistuje
+
+# LOCALIZATION NOTE: Error message given when a file argument points to a file
+# that exists, but should not (e.g. for use with File->Save As) %1$S is a
+# filename
+fileErrExists=Súbor '%1$S' už existuje
+
+# LOCALIZATION NOTE: Error message given when a file argument points to a
+# non-file, when a file is needed. %1$S is a filename
+fileErrIsNotFile='%1$S' nie je súbor
+
+# LOCALIZATION NOTE: Error message given when a file argument points to a
+# non-directory, when a directory is needed (e.g. for use with 'cd') %1$S is a
+# filename
+fileErrIsNotDirectory='%1$S' nie je priečinok
+
+# LOCALIZATION NOTE: Error message given when a file argument does not match
+# the specified regular expression %1$S is a filename %2$S is a regular
+# expression
+fileErrDoesntMatch='%1$S' sa nezhoduje s '%2$S'
+
+# LOCALIZATION NOTE: 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=Zvoľte %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.
+# LOCALIZATION NOTE (fieldArrayAdd, fieldArrayDel): When a command has a
+# parameter that can be repeated multiple 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=Pridať
-
-# 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=Odstrániť
 
-# LOCALIZATION NOTE (fieldMenuMore): When the menu has displayed all the
-# matches that it should (i.e. about 10 items) then we display this to alert
-# the user that more matches are available.
+# LOCALIZATION NOTE: When the menu has displayed all the matches that it
+# should (i.e. about 10 items) then we display this to alert the user that
+# more matches are available.
 fieldMenuMore=Ďalšie zhody, skúšajte ďalej
 
-# 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.
+# LOCALIZATION NOTE: 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=Rozsah stratený
 
-# 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.
+# LOCALIZATION NOTE (jstypeParseMissing, jstypeBeginSyntax,
+# jstypeBeginUnterm): These error messages are displayed when the command line
+# is doing JavaScript completion and encounters errors.
 jstypeParseMissing=Nie je možné nájsť vlastnosť '%S'
-
-# LOCALIZATION NOTE (jstypeBeginSyntax): When the command line is doing
-# JavaScript completion using invalid JavaScript, this error message is
-# displayed.
 jstypeBeginSyntax=Chyba syntaxe
+jstypeBeginUnterm=Neukončený reťazec
 
-# 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=Neukončený reťazec textu
-
-# LOCALIZATION NOTE (jstypeParseError): If the system for providing JavaScript
-# completions encounters and error it displays this.
+# LOCALIZATION NOTE: This message is displayed if the system for providing
+# JavaScript completions encounters and error it displays this.
 jstypeParseError=Chyba
 
-# 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.
+# LOCALIZATION NOTE (typesNumberNan, typesNumberNotInt2, typesDateNan): These
+# error messages are displayed when the command line is passed a variable
+# which has the wrong format and can't be converted. Parameters: %S is the
+# passed variable.
 typesNumberNan=Nie je možné skonvertovať "%S" na číslo.
-
-# 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=Hodnota %1$S je väčšia ako povolené maximum: %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=Hodnota %1$S je menšia ako povolené minimum: %2$S.
-
-# LOCALIZATION NOTE (typesNumberNotInt2): When the command line is passed a
-# number, but the number has a decimal part and floats are not allowed.
-typesNumberNotInt2=Nie je možné konvertovať "%S" na číslo.
-
-# LOCALIZATION NOTE (typesDateNan): When the command line is passed a date,
-# however the input string is not a valid date, this error message is
-# displayed.
+typesNumberNotInt2=Nie je možné konvertovať "%S" na celé číslo.
 typesDateNan=Nie je možné skonvertovať "%S" na dátum.
 
-# LOCALIZATION NOTE (typesDateMax): When the command line is passed a date,
-# but the number is later than the latest allowed date, this error message is
-# displayed.
+# LOCALIZATION NOTE (typesNumberMax, typesNumberMin, typesDateMax,
+# typesDateMin): These error messages are displayed when the command line is
+# passed a variable which has a value out of range (number or date).
+# Parameters: %1$S is the passed variable, %2$S is the limit value.
+typesNumberMax=Hodnota %1$S je väčšia ako povolené maximum: %2$S.
+typesNumberMin=Hodnota %1$S je menšia ako povolené minimum: %2$S.
 typesDateMax=%1$S je neskôr ako maximálny povolený dátum %2$S.
-
-# LOCALIZATION NOTE (typesDateMin): When the command line is passed a date,
-# but the date is earlier than the earliest allowed number, this error message
-# is displayed.
 typesDateMin=%1$S je skôr ako minimálny povolený dátum %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.
+# LOCALIZATION NOTE: This error message is displayed when the command line is
+# passed an option with a limited number of correct values, but the passed
+# value is not one of them.
 typesSelectionNomatch=Nie je možné použiť '%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.
+# LOCALIZATION NOTE: This error message is displayed when the command line is
+# expecting a CSS query string, however the passed string is not valid.
 nodeParseSyntax=Chyba syntaxe v požiadavke 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.
+# LOCALIZATION NOTE (nodeParseMultiple, nodeParseNone): These error messages
+# are displayed when the command line is expecting a CSS string that matches a
+# single node, but more nodes (or none) match.
 nodeParseMultiple=Príliš veľa zhodných uzlov (%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=Žiadne zhodné uzly
 
-# 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.
+# LOCALIZATION NOTE (helpDesc, helpManual, helpSearchDesc, helpSearchManual3):
+# These strings describe the "help" command, used to display a description of
+# a command (e.g. "help pref"), and its parameter 'search'.
 helpDesc=Zobrazí pomocníka k dostupným príkazom
-
-# LOCALIZATION NOTE (helpManual): A fuller description of the 'help' command.
-# Displayed when the user asks for help on what it does.
 helpManual=Poskytuje pomocníka pre zadaný príkaz (ak je zadaný výraz vyhľadávania a tento zodpovedá presne) alebo pre dostupné príkazy (ak nie je zadaný výraz vyhľadávania alebo nezodpovedá presne).
-
-# LOCALIZATION NOTE (helpSearchDesc): A very short description of the 'search'
-# parameter to the 'help' command. See helpSearchManual3 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=Výraz vyhľadávania
-
-# LOCALIZATION NOTE (helpSearchManual3): A fuller description of the 'search'
-# parameter to the 'help' command. Displayed when the user asks for help on
-# what it does.
 helpSearchManual3=Výraz vyhľadávania na prefiltrovanie zoznamu príkazov. Regulárne výrazy nie sú podporované.
 
-# 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
+# LOCALIZATION NOTE (helpManSynopsis, helpManDescription, helpManParameters):
+# These strings are displayed in the help page for a command in the console.
 helpManSynopsis=Prehľad
-
-# LOCALIZATION NOTE (helpManDescription): A heading shown in a help page for a
-# command in the console. This heading precedes the top level description.
 helpManDescription=Popis
-
-# LOCALIZATION NOTE (helpManParameters): A heading shown above the parameters
-# in a help page for a command in the console.
 helpManParameters=Parametre
 
-# LOCALIZATION NOTE (helpManNone): Some text shown under the parameters
-# heading in a help page for a command which has no parameters.
+# LOCALIZATION NOTE: This message is displayed in the help page if the command
+# has no parameters.
 helpManNone=žiadne
 
-# LOCALIZATION NOTE (helpListAll): The heading shown in response to the 'help'
+# LOCALIZATION NOTE: This message is displayed in response to the 'help'
 # command when used without a filter, just above the list of known commands.
 helpListAll=Dostupné príkazy:
 
-# LOCALIZATION NOTE (helpListPrefix): The heading shown in response to the
-# 'help <search>' command (i.e. with a search string), just above the list of
-# matching commands.
+# LOCALIZATION NOTE (helpListPrefix, helpListNone): These messages are
+# displayed in response to the 'help <search>' command (i.e. with a search
+# string), just above the list of matching commands. Parameters: %S is the
+# search string.
 helpListPrefix=Príkazy začínajúce '%1$S':
-
-# LOCALIZATION NOTE (helpListNone): The heading shown in response to the 'help
-# <search>' command (i.e. with a search string), when there are no matching
-# commands.
 helpListNone=Žiadne príkazy nezačínajú reťazcom '%1$S'
 
-# LOCALIZATION NOTE (helpManRequired): When the 'help x' command wants to show
-# the manual for the 'x' command it needs to be able to describe the
-# parameters as either required or optional, or if they have a default value.
-# See also 'helpManOptional' and 'helpManDefault'.
+# LOCALIZATION NOTE (helpManRequired, helpManOptional, helpManDefault): When
+# the 'help x' command wants to show the manual for the 'x' command, it needs
+# to be able to describe the parameters as either required or optional, or if
+# they have a default value.
 helpManRequired=vyžadované
-
-# LOCALIZATION NOTE (helpManOptional): See description of 'helpManRequired'
 helpManOptional=voliteľné
-
-# LOCALIZATION NOTE (helpManDefault): See description of 'helpManRequired'. %1$
-# S is the default value
 helpManDefault=voliteľné, predvolené=%1$S
 
-# LOCALIZATION NOTE (subCommands): Text shown as part of the output of the
-# 'help' command when the command in question has sub-commands, before a list
-# of the matching sub-commands
+# LOCALIZATION NOTE: Text shown as part of the output of the 'help' command
+# when the command in question has sub-commands, before a list of the matching
+# sub-commands.
 subCommands=Podpríkazy
 
-# LOCALIZATION NOTE (subCommandsNone): Text shown as part of the output of the
-# 'help' command when the command in question should have sub-commands but in
-# fact has none
+# LOCALIZATION NOTE: Text shown as part of the output of the 'help' command
+# when the command in question should have sub-commands but in fact has none.
 subCommandsNone=Žiadne
 
-# LOCALIZATION NOTE (contextDesc): A very short description of the 'context'
-# 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 contextManual for
-# a fuller description of what it does.
+# LOCALIZATION NOTE (contextDesc, contextManual, contextPrefixDesc): These
+# strings are used to describe the 'context' command and its 'prefix'
+# parameter. See localization comment for 'connect' for an explanation about
+# 'prefix'.
 contextDesc=Koncentruje sa na skupinu príkazov
-
-# LOCALIZATION NOTE (contextManual): A fuller description of the 'context'
-# command. Displayed when the user asks for help on what it does.
 contextManual=Nastaví predvolený prefix pre budúce príkazy. Napríklad 'context git' by umožnilo zadávať 'commit' namiesto 'git commit'.
-
-# LOCALIZATION NOTE (contextPrefixDesc): A short description of the 'prefix'
-# parameter to the 'context' command. This string is designed to be shown in a
-# dialog with restricted space, which is why it should be as short as
-# possible.
 contextPrefixDesc=Prefix príkazu
 
-# LOCALIZATION NOTE (contextNotParentError): An error message displayed during
-# the processing of the 'context' command, when the found command is not a
-# parent command.
+# LOCALIZATION NOTE: This message message displayed during the processing of
+# the 'context' command, when the found command is not a parent command.
 contextNotParentError=Nie je možné použiť '%1$S' ako prefix, pretože to nie je rodičovský príkaz.
 
-# LOCALIZATION NOTE (contextReply): A message displayed during the processing
-# of the 'context' command, to indicate success.
+# LOCALIZATION NOTE (contextReply, contextEmptyReply): These messages are
+# displayed during the processing of the 'context' command, to indicate
+# success or that there is no command prefix.
 contextReply=Používa sa %1$S ako prefix príkazu
-
-# LOCALIZATION NOTE (contextEmptyReply): A message displayed during the
-# processing of the 'context' command, to indicate that there is no command
-# prefix
 contextEmptyReply=Prefix príkazu je zrušený
 
-# LOCALIZATION NOTE (connectDesc): A very short description of the 'connect'
-# 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 connectManual for
-# a fuller description of what it does.
+# LOCALIZATION NOTE (connectDesc, connectManual, connectPrefixDesc,
+# connectPortDesc, connectHostDesc, connectDupReply): These strings describe
+# the 'connect' command and all its available parameters. A 'prefix' is an 
+# alias for the remote server (think of it as a "connection name"), and it
+# allows to identify a specific server when connected to multiple remote
+# servers.
 connectDesc=Proxy príkazy na server
-
-# LOCALIZATION NOTE (connectManual): A fuller description of the 'connect'
-# command. Displayed when the user asks for help on what it does.
 connectManual=Pripojí sa k serveru, vytvára lokálne verzie príkazov na serveri. Vzdialené príkazy majú prefix na ich odlíšenie od lokálnych príkazov (ak sa ho chcete zbaviť, viď príkaz context).
-
-# LOCALIZATION NOTE (connectPrefixDesc): A short description of the 'prefix'
-# parameter to the 'connect' command. This string is designed to be shown in a
-# dialog with restricted space, which is why it should be as short as
-# possible.
 connectPrefixDesc=Rodičovský prefix pre importované príkazy
-
-# LOCALIZATION NOTE (connectPortDesc): A short description of the 'port'
-# parameter to the 'connect' command. This string is designed to be shown in a
-# dialog with restricted space, which is why it should be as short as
-# possible.
 connectPortDesc=Port TCP, na ktorom sa bude počúvať
-
-# LOCALIZATION NOTE (connectHostDesc): A short description of the 'host'
-# parameter to the 'connect' command. This string is designed to be shown in a
-# dialog with restricted space, which is why it should be as short as
-# possible.
 connectHostDesc=Názov servera, ku ktorému sa pripája
-
-# LOCALIZATION NOTE (connectDupReply): An error condition from executing the
-# 'connect' command
 connectDupReply=Pripojenie nazvané %S už existuje.
 
-# LOCALIZATION NOTE (connectReply): The output of the 'connect' command,
-# telling the user what it has done.
+# LOCALIZATION NOTE: The output of the 'connect' command, telling the user
+# what it has done. Parameters: %S is the prefix command. See localization
+# comment for 'connect' for an explanation about 'prefix'.
 connectReply=Pridané príkazy %S.
 
-# LOCALIZATION NOTE (disconnectDesc): A very short description of the
-# 'disconnect' 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 connectManual for a fuller description of what it does.
-disconnectDesc=Proxy príkazy na server
-
-# LOCALIZATION NOTE (disconnectManual): A fuller description of the
-# 'disconnect' command. Displayed when the user asks for help on what it does.
-disconnectManual=Pripojí sa k serveru, vytvára lokálne verzie príkazov na serveri. Vzdialené príkazy majú prefix na ich odlíšenie od lokálnych príkazov (ak sa ho chcete zbaviť, viď príkaz context).
-
-# LOCALIZATION NOTE (disconnectPrefixDesc): A short description of the
-# 'prefix' parameter to the 'disconnect' command. This string is designed to
-# be shown in a dialog with restricted space, which is why it should be as
-# short as possible.
+# LOCALIZATION NOTE (disconnectDesc2, disconnectManual2, disconnectPrefixDesc,
+# disconnectForceDesc): These strings describe the 'disconnect' command and
+# all its available parameters. See localization comment for 'connect' for an
+# explanation about 'prefix'.
+disconnectDesc2=Odpojiť zo servera
+disconnectManual2=Zo servera odpojí aktuálne pripojené vzdialené príkazy
 disconnectPrefixDesc=Rodičovský prefix pre importované príkazy
-
-# LOCALIZATION NOTE (disconnectForceDesc): A short description of the 'force'
-# parameter to the 'disconnect' command. This string is designed to be shown
-# in a dialog with restricted space, which is why it should be as short as
-# possible.
 disconnectForceDesc=Ignorovať zostávajúce požiadavky
     
-# LOCALIZATION NOTE (disconnectReply): The output of the 'disconnect' command,
-# telling the user what it's done.
+# LOCALIZATION NOTE: This is the output of the 'disconnect' command,
+# explaining the user what has been done. Parameters: %S is the number of
+# commands removed.
 disconnectReply=Odstránené príkazy %S.
 
-# LOCALIZATION NOTE (disconnectOutstanding): An error message displayed when
-# the user attempts to disconnect before all requests have completed. %1$S is
-# a list of commands which are incomplete
+# LOCALIZATION NOTE: This error message is displayed when the user attempts to
+# disconnect before all requests have completed. Parameters: %S is a list of
+# incomplete requests.
 disconnectOutstanding=Zostávajúce požiadavky (%1$S)
 
-# LOCALIZATION NOTE (prefDesc): A very short description of the 'pref'
-# 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 prefManual for a
-# fuller description of what it does.
+# LOCALIZATION NOTE (prefDesc, prefManual, prefListDesc, prefListManual,
+# prefListSearchDesc, prefListSearchManual, prefShowDesc, prefShowManual,
+# prefShowSettingDesc, prefShowSettingManual): These strings describe the
+# 'pref' command and all its available sub-commands and parameters.
 prefDesc=Príkazy pre nastavenia
-
-# LOCALIZATION NOTE (prefManual): A fuller description of the 'pref' command.
-# Displayed when the user asks for help on what it does.
 prefManual=Príkazy na zobrazenie a zmenu nastavení pre GCLI a okolité prostredie
-
-# LOCALIZATION NOTE (prefListDesc): A very short description of the 'pref
-# list' 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
-# prefListManual for a fuller description of what it does.
 prefListDesc=Zobrazí dostupné predvoľby
-
-# LOCALIZATION NOTE (prefListManual): A fuller description of the 'pref list'
-# command. Displayed when the user asks for help on what it does.
 prefListManual=Zobrazí zoznam predvolieb, voliteľne filtrované pomocou parametra 'search'
-
-# LOCALIZATION NOTE (prefListSearchDesc): A short description of the 'search'
-# parameter to the 'pref list' command. See prefListSearchManual 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.
 prefListSearchDesc=Filter zoznamu zobrazených predvolieb
-
-# LOCALIZATION NOTE (prefListSearchManual): A fuller description of the
-# 'search' parameter to the 'pref list' command. Displayed when the user asks
-# for help on what it does.
 prefListSearchManual=Vyhľadá zadaný reťazec v zozname dostupných predvolieb
-
-# LOCALIZATION NOTE (prefShowDesc): A very short description of the 'pref
-# show' 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
-# prefShowManual for a fuller description of what it does.
 prefShowDesc=Zobrazí hodnotu predvoľby
-
-# LOCALIZATION NOTE (prefShowManual): A fuller description of the 'pref show'
-# command. Displayed when the user asks for help on what it does.
 prefShowManual=Zobrazí hodnotu zadanej predvoľby
-
-# LOCALIZATION NOTE (prefShowSettingDesc): A short description of the
-# 'setting' parameter to the 'pref show' command. See prefShowSettingManual
-# 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.
 prefShowSettingDesc=Predvoľba na zobrazenie
-
-# LOCALIZATION NOTE (prefShowSettingManual): A fuller description of the
-# 'setting' parameter to the 'pref show' command. Displayed when the user asks
-# for help on what it does.
 prefShowSettingManual=Názov predvoľby na zobrazenie
 
-# LOCALIZATION NOTE (prefShowSettingValue): This is used to show the
-# preference name and the associated preference value. %1$S is replaced with
-# the preference name and %2$S is replaced with the preference value.
+# LOCALIZATION NOTE: This message is used to show the preference name and the
+# associated preference value. Parameters: %1$S is the preference name, %2$S
+# is the preference value.
 prefShowSettingValue=%1$S: %2$S
 
-# LOCALIZATION NOTE (prefSetDesc): A very short description of the 'pref set'
-# 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 prefSetManual for
-# a fuller description of what it does.
+# LOCALIZATION NOTE (prefSetDesc, prefSetManual, prefSetSettingDesc,
+# prefSetSettingManual, prefSetValueDesc, prefSetValueManual): These strings
+# describe the 'pref set' command and all its parameters.
 prefSetDesc=Zmení predvoľbu
-
-# LOCALIZATION NOTE (prefSetManual): A fuller description of the 'pref set'
-# command. Displayed when the user asks for help on what it does.
 prefSetManual=Zmení predvoľby definované prostredím
-
-# LOCALIZATION NOTE (prefSetSettingDesc): A short description of the 'setting'
-# parameter to the 'pref set' command. See prefSetSettingManual 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.
 prefSetSettingDesc=Predvoľba na zmenu
-
-# LOCALIZATION NOTE (prefSetSettingManual): A fuller description of the
-# 'setting' parameter to the 'pref set' command. Displayed when the user asks
-# for help on what it does.
 prefSetSettingManual=Názov predvoľby, ktorá sa bude meniť.
-
-# LOCALIZATION NOTE (prefSetValueDesc): A short description of the 'value'
-# parameter to the 'pref set' command. See prefSetValueManual 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.
 prefSetValueDesc=Nová hodnota predvoľby
-
-# LOCALIZATION NOTE (prefSetValueManual): A fuller description of the 'value'
-# parameter to the 'pref set' command. Displayed when the user asks for help
-# on what it does.
 prefSetValueManual=Nová hodnota pre zadanú predvoľbu
 
-# LOCALIZATION NOTE (prefSetCheckHeading): Title displayed to the user the
-# first time they try to alter a setting This is displayed directly above
-# prefSetCheckBody and prefSetCheckGo.
+# LOCALIZATION NOTE (prefSetCheckHeading, prefSetCheckBody, prefSetCheckGo):
+# These strings are displayed to the user the first time they try to alter a
+# setting.
 prefSetCheckHeading=Naozaj viete, čo robíte?
-
-# LOCALIZATION NOTE (prefSetCheckBody): The main text of the warning displayed
-# to the user the first time they try to alter a setting. See also
-# prefSetCheckHeading and prefSetCheckGo.
 prefSetCheckBody=Zmenou týchto pokročilých nastavení môžete ovplyvniť stabilitu, bezpečnosť a výkon aplikácie. Mali by ste pokračovať len v prípade, že viete, čo robíte.
-
-# LOCALIZATION NOTE (prefSetCheckGo): The text to enable preference editing.
-# Displayed in a button directly under prefSetCheckHeading and
-# prefSetCheckBody
 prefSetCheckGo=Budem opatrný, sľubujem!
 
-# LOCALIZATION NOTE (prefResetDesc): A very short description of the 'pref
-# reset' 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
-# prefResetManual for a fuller description of what it does.
+# LOCALIZATION NOTE (prefResetDesc, prefResetManual, prefResetSettingDesc,
+# prefResetSettingManual): These strings describe the 'pref reset' command and
+# all its parameters.
 prefResetDesc=Nastaví predvoľbu na predvolenú hodnotu
-
-# LOCALIZATION NOTE (prefResetManual): A fuller description of the 'pref
-# reset' command. Displayed when the user asks for help on what it does.
 prefResetManual=Nastaví hodnotu predvoľby na hodnotu predvolenú v systéme
-
-# LOCALIZATION NOTE (prefResetSettingDesc): A short description of the
-# 'setting' parameter to the 'pref reset' command. See prefResetSettingManual
-# 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.
 prefResetSettingDesc=Predvoľba na vynulovanie
-
-# LOCALIZATION NOTE (prefResetSettingManual): A fuller description of the
-# 'setting' parameter to the 'pref reset' command. Displayed when the user
-# asks for help on what it does.
 prefResetSettingManual=Názov predvoľby, ktorej hodnota bude nastavená na hodnotu predvolenú v systéme
 
-# LOCALIZATION NOTE (prefOutputFilter): Displayed in the output from the 'pref
+# LOCALIZATION NOTE: This string is displayed in the output from the 'pref
 # list' command as a label to an input element that allows the user to filter
-# the results
+# the results.
 prefOutputFilter=Filter
 
-# LOCALIZATION NOTE (prefOutputName): Displayed in the output from the 'pref
-# list' command as a heading to a table. The column contains the names of the
-# available preferences
+# LOCALIZATION NOTE (prefOutputName, prefOutputValue): These strings are
+# displayed in the output from the 'pref list' command as table headings.
 prefOutputName=Názov
-
-# LOCALIZATION NOTE (prefOutputValue): Displayed in the output from the 'pref
-# list' command as a heading to a table. The column contains the values of the
-# available preferences
 prefOutputValue=Hodnota
 
-# LOCALIZATION NOTE (introDesc): A very short description of the 'intro'
-# 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 introManual for a
-# fuller description of what it does.
+# LOCALIZATION NOTE (introDesc, introManual): These strings describe the
+# 'intro' command. The localization of 'Got it!' should be the same used in
+# introTextGo.
 introDesc=Zobrazí úvodnú správu
-
-# LOCALIZATION NOTE (introManual): A fuller description of the 'intro'
-# command. Displayed when the user asks for help on what it does.
 introManual=Opätovne zobrazí správu, ktorá sa zobrazuje novým používateľom až pokiaľ nekliknú na tlačidlo 'Budem opatrný, sľubujem!'
 
-# LOCALIZATION NOTE (introTextOpening2): The 'intro text' opens when the user
+# LOCALIZATION NOTE (introTextOpening2, introTextCommands, introTextKeys2,
+# introTextF1Escape, introTextGo): These strings are displayed when the user
 # first opens the developer toolbar to explain the command line, and is shown
-# each time it is opened until the user clicks the 'Got it!' button. This
-# string is the opening paragraph of the intro text.
+# each time it is opened until the user clicks the 'Got it!' button.
 introTextOpening2=Tento príkazový riadok je navrhnutý pre vývojárov. Zameriava sa na rýchlosť vstupu cez syntax JavaScriptu syntax and prehľadné zobrazovanie výstupu.
-
-# LOCALIZATION NOTE (introTextCommands): For information about the 'intro
-# text' see introTextOpening2. The second paragraph is in 2 sections, the
-# first section points the user to the 'help' command.
 introTextCommands=Ak chcete zobraziť zoznam príkazov zadajte
-
-# LOCALIZATION NOTE (introTextKeys2): For information about the 'intro text'
-# see introTextOpening2. The second section in the second paragraph points the
-# user to the F1/Escape keys which show and hide hints.
 introTextKeys2=, alebo ak chcete zobraziť pomocníka, stlačte
-
-# LOCALIZATION NOTE (introTextF1Escape): For information about the 'intro
-# text' see introTextOpening2. This string is used with introTextKeys2, and
-# contains the keys that are pressed to open and close hints.
 introTextF1Escape=F1/Esc
-
-# LOCALIZATION NOTE (introTextGo): For information about the 'intro text' see
-# introTextOpening2. The text on the button that dismisses the intro text.
 introTextGo=Jasné, rozumiem.
 
-# LOCALIZATION NOTE (hideIntroDesc): Short description of the 'hideIntro'
-# setting. Displayed when the user asks for help on the settings.
+# LOCALIZATION NOTE: This is a short description of the 'hideIntro' setting.
 hideIntroDesc=Zobrazí uvítaciu správu
 
-# LOCALIZATION NOTE (eagerHelperDesc): Short description of the 'eagerHelper'
-# setting. Displayed when the user asks for help on the settings. eagerHelper
-# allows users to select between showing no tooltips, permanent tooltips, and
-# only important tooltips
+# LOCALIZATION NOTE: This is a description of the 'eagerHelper' setting. It's
+# displayed when the user asks for help on the settings. eagerHelper allows
+# users to select between showing no tooltips, permanent tooltips, and only
+# important tooltips.
 eagerHelperDesc=Ako často sa zobrazujú tooltipy
 
-# LOCALIZATION NOTE (allowSetDesc): Short description of the 'allowSetDesc'
-# setting. Displayed when the user asks for help on the settings.
+# LOCALIZATION NOTE: This is a short description of the 'allowSetDesc'
+# setting.
 allowSetDesc=Povolil používateľ príkaz 'pref set'?
 
-# 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
+# LOCALIZATION NOTE: This text is 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=Ďalšie informácie na stránke MDN.
--- a/browser/chrome/browser/devtools/gclicommands.properties
+++ b/browser/chrome/browser/devtools/gclicommands.properties
@@ -410,16 +410,66 @@ dbgStepInDesc=Vykoná aktuálny príkaz a zastaví na ďalšom príkaze. Ak je aktuálnym príkazom volanie funkcie, ladenie vkročí do funkcie, inak zastaví na ďalšom príkaze
 # LOCALIZATION NOTE (dbgStepOutDesc) A very short string used to describe the
 # function of the dbg step out command.
 dbgStepOutDesc=Vyjde z aktuálnej funkcie a o úroveň vyššie, ak je funkcia vnorená. Ak sa potom nachádza v hlavnom tele, skript sa vykoná do konca alebo po ďalší bod prerušenia. Príkazy medzi nimi sú vykonané, ale nie sú krokované
 
 # LOCALIZATION NOTE (dbgListSourcesDesc) A very short string used to describe the
 # function of the dbg list command.
 dbgListSourcesDesc=Zobrazí zoznam zdrojových adries URL načítaných v ladení
 
+# LOCALIZATION NOTE (dbgBlackBoxDesc) A very short string used to describe the
+# function of the 'dbg blackbox' command.
+dbgBlackBoxDesc=Pridá zdroje v ladiacom nástroji do black boxu
+
+# LOCALIZATION NOTE (dbgBlackBoxSourceDesc) A very short string used to describe the
+# 'source' parameter to the 'dbg blackbox' command.
+dbgBlackBoxSourceDesc=Zdroj, ktorý bude pridaný do black boxu
+
+# LOCALIZATION NOTE (dbgBlackBoxGlobDesc) A very short string used to describe the
+# 'glob' parameter to the 'dbg blackbox' command.
+dbgBlackBoxGlobDesc=Pridá do black boxu všetky zdroje, ktoré sa zhodujú s výrazom (napríklad "*.min.js")
+
+# LOCALIZATION NOTE (dbgBlackBoxEmptyDesc) A very short string used to let the
+# user know that no sources were black boxed.
+dbgBlackBoxEmptyDesc=(v black boxe nie sú žiadne zdroje)
+
+# LOCALIZATION NOTE (dbgBlackBoxNonEmptyDesc) A very short string used to let the
+# user know which sources were black boxed.
+dbgBlackBoxNonEmptyDesc=Nasledovné zdroje boli pridané do black boxu:
+
+# LOCALIZATION NOTE (dbgBlackBoxErrorDesc) A very short string used to let the
+# user know there was an error black boxing a source (whose url follows this
+# text).
+dbgBlackBoxErrorDesc=Chyba black boxu:
+
+# LOCALIZATION NOTE (dbgUnBlackBoxDesc) A very short string used to describe the
+# function of the 'dbg unblackbox' command.
+dbgUnBlackBoxDesc=Zastaví black boxing zdrojov v nástroji ladenia
+
+# LOCALIZATION NOTE (dbgUnBlackBoxSourceDesc) A very short string used to describe the
+# 'source' parameter to the 'dbg unblackbox' command.
+dbgUnBlackBoxSourceDesc=Zdroj, pre ktorý bude zastavený black boxing
+
+# LOCALIZATION NOTE (dbgUnBlackBoxGlobDesc) A very short string used to describe the
+# 'glob' parameter to the 'dbg blackbox' command.
+dbgUnBlackBoxGlobDesc=Zastaví black boxing pre všetky zdroje, ktoré sa zhodujú s výrazom (napríklad "*.min.js")
+
+# LOCALIZATION NOTE (dbgUnBlackBoxEmptyDesc) A very short string used to let the
+# user know that we did not stop black boxing any sources.
+dbgUnBlackBoxEmptyDesc=(black boxing nebol zastavený pre žiadne zdroje)
+
+# LOCALIZATION NOTE (dbgUnBlackBoxNonEmptyDesc) A very short string used to let the
+# user know which sources we stopped black boxing.
+dbgUnBlackBoxNonEmptyDesc=Black boxing zastavený pre nasledovné zdroje:
+
+# LOCALIZATION NOTE (dbgUnBlackBoxErrorDesc) A very short string used to let the
+# user know there was an error black boxing a source (whose url follows this
+# text).
+dbgUnBlackBoxErrorDesc=Chyba pri zastavovaní black boxing:
+
 # 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=Zavrie konzolu
 
 # LOCALIZATION NOTE (consoleopenDesc) A very short description of the
 # 'console open' 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.
@@ -499,16 +549,31 @@ resizeModeManual2=Stránky v režime Responsive design reagujú na svoje prostredie, takže vyzerajú dobre na mobilnom zariadení, širokouhlom televíznom prijímači a na všetkých zariadeniach medzi nimi. Režim Responsive Design umožňuje jednoducho otestovať rôzne rozlíšenia stránky priamo v prehliadači %1$S bez nutnosti meniť rozlíšenie celého prehliadača.
 # name, which is why it should be as short as possible.
 cmdDesc=Narábanie s príkazmi
 
 # LOCALIZATION NOTE (cmdRefreshDesc) A very short description of the 'cmd refresh'
 # 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.
 cmdRefreshDesc=Opätovne načíta obsah adresára mozcmd
 
+# LOCALIZATION NOTE (cmdStatus) When the we load new commands from mozcmd
+# directory, we report on how many we loaded. %1$S is a count of the number
+# of loaded commands, and %2$S is the directory we loaded from.
+cmdStatus=Načítané príkazy (celkom %1$S) z priečinka '%2$S'
+
+# LOCALIZATION NOTE (cmdSetdirDesc) 
+cmdSetdirDesc=Nastaví priečinok mozcmd
+
+# LOCALIZATION NOTE (cmdSetdirManual) 
+cmdSetdirManual=Priečinok 'mozcmd' je jednoduchá cesta, ako vytvoriť vlastné príkazy pre príkazový riadok Firefoxu. Podrobnejšie informácie nájdete v <a href="https://developer.mozilla.org/en-US/docs/Tools/GCLI/Customization">dokumentácii na MDN</a>.
+
+# LOCALIZATION NOTE (cmdSetdirDirectoryDesc) The description of the directory
+# parameter to the 'cmd setdir' command.
+cmdSetdirDirectoryDesc=Priečinok obsahujúci súbory .mozcmd
+
 # LOCALIZATION NOTE (addonDesc) A very short description of the 'addon'
 # 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.
 addonDesc=Správa doplnkov
 
 # LOCALIZATION NOTE (addonListDesc) A very short description of the 'addon list'
 # 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.
@@ -1226,45 +1291,35 @@ profilerListDesc=Zobrazí všetky profily
 # of the profiler show command.
 profilerShowDesc=Zobrazí individuálny profil
 
 # LOCALIZATION NOTE (profilerShowManual) A fuller description of the 'profile name'
 # parameter. This parameter is used to name a newly created profile or to lookup
 # an existing profile by its name.
 profilerShowManual=Názov profilu.
 
-# LOCALIZATION NOTE (profilerAlreadyStarted) A message that is displayed whenever
+# LOCALIZATION NOTE (profilerAlreadyStarted2) A message that is displayed whenever
 # an operation cannot be completed because the profile in question has already
 # been started.
-profilerAlreadyStarted=Tento profil už bol odštartovaný
-
-# LOCALIZATION NOTE (profilerAlreadyFinished) A message that is displayed whenever
-# an operation cannot be completed because the profile in question has already
-# been finished. It also contains a hint to use the 'profile show' command to see
-# the profiling results.
-profilerAlreadyFinished=Tento profil už bol ukončený. Ak chcete vidieť výsledky, použite príkaz 'profile show'
+profilerAlreadyStarted2=Profilovanie už beží
 
 # LOCALIZATION NOTE (profilerNotFound) A message that is displayed whenever
 # an operation cannot be completed because the profile in question could not be
 # found.
 profilerNotFound=Profil nebol nájdený
 
 # LOCALIZATION NOTE (profilerNotStarted2) A message that is displayed whenever
 # an operation cannot be completed because the profile in question has not been
 # started yet. It also contains a hint to use the 'profile start' command to
 # start the profiler.
-profilerNotStarted2=Tento profil zatiaľ nebol odštartovaný. Ak chcete spustiť profilovanie, použite príkaz 'profile start'
+profilerNotStarted3=Profilovanie zatiaľ nebeží. Ak ho chcete spustiť, použite príkaz 'profile start'
 
-# LOCALIZATION NOTE (profilerStarting2) A very short string that indicates that
-# we're starting the profiler.
-profilerStarting2=Spúšťa sa...
-
-# LOCALIZATION NOTE (profilerStopping2) A very short string that indicates that
-# we're stopping the profiler.
-profilerStopping2=Zastavuje sa...
+# LOCALIZATION NOTE (profilerStarted2) A very short string that indicates that
+# we have started recording.
+profilerStarted2=Zaznamenáva sa…
 
 # LOCALIZATION NOTE (profilerNotReady) A message that is displayed whenever
 # an operation cannot be completed because the profiler has not been opened yet.
 profilerNotReady=Ak chcete, aby tento príkaz fungoval, musíte najskôr otvoriť nástroj na profilovanie
 
 # LOCALIZATION NOTE (listenDesc) A very short string used to describe the
 # function of the 'listen' command.
 listenDesc=Otvorí vzdialený port ladenia
@@ -1283,8 +1338,18 @@ listenDisabledOutput=Počúvanie je zakázané pomocou voľby devtools.debugger.remote-enabled
 
 # LOCALIZATION NOTE (listenInitOutput) Text of a message output during the
 # execution of the 'listen' command. %1$S is a port number
 listenInitOutput=Počúva sa na porte %1$S
 
 # LOCALIZATION NOTE (listenNoInitOutput) Text of a message output during the
 # execution of the 'listen' command.
 listenNoInitOutput=Server ladenia nebol inicializovaný
+
+# LOCALIZATION NOTE (mediaDesc, mediaEmulateDesc, mediaEmulateManual,
+# mediaEmulateType, mediaResetDesc, mediaResetManual) These strings describe
+# the 'media' commands and all available parameters.
+mediaDesc=Emulácia typu média CSS
+mediaEmulateDesc=Emuluje zadaný typ média CSS
+mediaEmulateManual=Zobrazí dokument tak, ako by bol zobrazený na zariadení podporujúcom zadaný typ média (CSS media), vrátane aplikovaných pravidiel špecifických pre daný typ média.
+mediaEmulateType=Typ média na emulovanie
+mediaResetDesc=Zastaví emulovanie typu média CSS
+mediaResetManual=Zastaví emulovanie typu média CSS (CSS media)
--- a/browser/chrome/browser/devtools/inspector.properties
+++ b/browser/chrome/browser/devtools/inspector.properties
@@ -29,17 +29,17 @@ debuggerPausedWarning.message=Ladenie je pozastavené. Niektoré funkcie ako výber myšou nebudú fungovať.
 # LOCALIZATION NOTE (nodeMenu.tooltiptext)
 # This menu appears in the Infobar (on top of the highlighted node) once
 # the node is selected.
 nodeMenu.tooltiptext=Operácie nad uzlom
 
 # LOCALIZATION NOTE (inspector.*)
 # Used for the menuitem in the tool menu
 inspector.label=Prieskumník stránok
-inspector.commandkey=I
+inspector.commandkey=C
 inspector.accesskey=k
 
 # LOCALIZATION NOTE (markupView.more.*)
 # When there are too many nodes to load at once, we will offer to
 # show all the nodes.
 markupView.more.showing=Niektoré uzly boli skryté.
 markupView.more.showAll=Zobraziť všetky uzly (celkom %S)
 inspector.tooltip=Prieskumník DOM a štýlov
\ No newline at end of file
--- a/browser/chrome/browser/devtools/netmonitor.dtd
+++ b/browser/chrome/browser/devtools/netmonitor.dtd
@@ -163,8 +163,49 @@
   -  in the network details timings tab identifying the amount of time spent
   -  in a "wait" state. -->
 <!ENTITY netmonitorUI.timings.wait        "Čakanie:">
 
 <!-- LOCALIZATION NOTE (debuggerUI.timings.receive): This is the label displayed
   -  in the network details timings tab identifying the amount of time spent
   -  in a "receive" state. -->
 <!ENTITY netmonitorUI.timings.receive     "Prijímanie:">
+
+<!-- LOCALIZATION NOTE (netmonitorUI.context.copyUrl): This is the label displayed
+  -  on the context menu that copies the selected request's url -->
+<!ENTITY netmonitorUI.context.copyUrl      "Kopírovať adresu URL">
+
+<!-- LOCALIZATION NOTE (netmonitorUI.context.copyUrl.accesskey): This is the access key
+  -  for the Copy URL menu item displayed in the context menu for a request -->
+<!ENTITY netmonitorUI.context.copyUrl.accesskey  "K">
+
+<!-- LOCALIZATION NOTE (debuggerUI.summary.resend): This is the label displayed
+  -  on the button in the headers tab that opens a form to resend the currently
+     displayed request -->
+<!ENTITY netmonitorUI.summary.resend      "Znova odoslať">
+
+<!-- LOCALIZATION NOTE (debuggerUI.summary.resend.accesskey): This is the access key
+  -  for the Resend menu item displayed in the context menu for a request -->
+<!ENTITY netmonitorUI.summary.resend.accesskey  "Z">
+
+<!-- LOCALIZATION NOTE (debuggerUI.custom.newRequest): This is the label displayed
+  -  as the title of the new custom request form -->
+<!ENTITY netmonitorUI.custom.newRequest   "Nová požiadavka">
+
+<!-- LOCALIZATION NOTE (debuggerUI.custom.query): This is the label displayed
+  -  above the query string entry in the custom request form -->
+<!ENTITY netmonitorUI.custom.query        "Reťazec dotazu:">
+
+<!-- LOCALIZATION NOTE (debuggerUI.custom.headers): This is the label displayed
+  -  above the request headers entry in the custom request form -->
+<!ENTITY netmonitorUI.custom.headers      "Hlavičky požiadavky:">
+
+<!-- LOCALIZATION NOTE (debuggerUI.custom.postData): This is the label displayed
+  -  above the request body entry in the custom request form -->
+<!ENTITY netmonitorUI.custom.postData     "Telo požiadavky:">
+
+<!-- LOCALIZATION NOTE (debuggerUI.custom.send): This is the label displayed
+  -  on the button which sends the custom request -->
+<!ENTITY netmonitorUI.custom.send         "Odoslať">
+
+<!-- LOCALIZATION NOTE (debuggerUI.custom.cancel): This is the label displayed
+  -  on the button which cancels and closes the custom request form -->
+<!ENTITY netmonitorUI.custom.cancel       "Zrušiť">
--- a/browser/chrome/browser/devtools/profiler.dtd
+++ b/browser/chrome/browser/devtools/profiler.dtd
@@ -8,8 +8,20 @@
   - 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 (profilerNew.label): This is the label for the
   -  button that creates a new profile. -->
 <!ENTITY profilerNew.label "Nový">
+
+<!-- LOCALIZATION NOTE (profilerStart.label): This is the label for the
+  -  button that starts the profiler. -->
+<!ENTITY profilerStart.label "Spustiť">
+
+<!-- LOCALIZATION NOTE (profilerStop.label): This is the label for the
+  -  button that stops the profiler. -->
+<!ENTITY profilerStop.label "Zastaviť">
+
+<!-- LOCALIZATION NOTE (profiler.importProfile): This string is displayed
+  -  on a button that opens a dialog to import a saved profile data file. -->
+<!ENTITY importProfile.label "Importovať…">
--- a/browser/chrome/browser/devtools/profiler.properties
+++ b/browser/chrome/browser/devtools/profiler.properties
@@ -92,8 +92,27 @@ profiler.stateIdle=Nečinný
 # This string is used to show that the profile in question is in RUNNING
 # state meaning that it has been started and currently gathering profile data.
 profiler.stateRunning=Bežiaci
 
 # LOCALIZATION NOTE (profiler.stateCompleted)
 # This string is used to show that the profile in question is in COMPLETED
 # state meaning that it has been started and stopped already.
 profiler.stateCompleted=Dokončený
+
+# LOCALIZATION NOTE (profiler.sidebarNotice)
+# This string is displayed in the profiler sidebar when there are no
+# existing profiles to show (usually happens when the user opens the
+# profiler for the first time).
+profiler.sidebarNotice=Zatiaľ žiadne profily.
+
+# LOCALIZATION NOTE (profiler.save)
+# This string is displayed as a label for a button that opens a Save File
+# dialog where user can save generated profiler to a file.
+profiler.save=Uložiť
+
+# LOCALIZATION NOTE (profiler.saveFileAs)
+# This string as a title for a Save File dialog.
+profiler.saveFileAs=Uložiť profil ako
+
+# LOCALIZATION NOTE (profiler.openFile)
+# This string as a title for a Open File dialog.
+profiler.openFile=Importovať profil
--- a/browser/chrome/browser/devtools/scratchpad.properties
+++ b/browser/chrome/browser/devtools/scratchpad.properties
@@ -80,8 +80,16 @@ help.openDocumentationPage=https://devel
 
 # LOCALIZATION NOTE (fileExists.notification): This is the message displayed
 # over the top of the the editor when a file does not exist.
 fileNoLongerExists.notification=Tento súbor už viac neexistuje.
 
 # LOCALIZATION NOTE (propertiesFilterPlaceholder): this is the text that
 # appears in the filter text box for the properties view container.
 propertiesFilterPlaceholder=Vlastnosti filtra
+
+# LOCALIZATION NOTE (stringConversionFailed): Happens when a value cannot be
+# converted to a string for inspection.
+stringConversionFailed=Nie je možné skonvertovať číslo na reťazec.
+
+# LOCALIZATION NOTE (connectionTimeout): message displayed when the Remote Scratchpad
+# fails to connect to the server due to a timeout.
+connectionTimeout=Čas spojenia vypršal. Skontrolujte Chybovú konzolu na oboch stranách a vyhľadajte potenciálne chybové hlásenia. Následne opäť otvorte editor Scratchpad a skúste to znova.
--- a/browser/chrome/browser/devtools/styleeditor.properties
+++ b/browser/chrome/browser/devtools/styleeditor.properties
@@ -20,17 +20,17 @@ chromeWindowTitle=Editor štýlov [%S]
 # the argument is the index (order) of the containing <style> element in the
 # document.
 inlineStyleSheet=<vložený súbor štýlov #%S>
 
 # LOCALIZATION NOTE  (newStyleSheet): This is the default name for a new
 # user-created style sheet.
 newStyleSheet=Nový súbor štýlov #%S
 
-# LOCALIZATION NOTE  (ruleCount.label): Semi-colon list of plural forms.
+# LOCALIZATION NOTE  (ruleCount.label): Semicolon-separated 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 pravidlo;#1 pravidlá;#1 pravidiel
 
 # LOCALIZATION NOTE  (error-load): This is shown when loading fails.
 error-load=Súbor štýlov nemohol byť načítaný.
--- a/browser/chrome/browser/devtools/toolbox.dtd
+++ b/browser/chrome/browser/devtools/toolbox.dtd
@@ -4,16 +4,18 @@
 
 <!-- LOCALIZATION NOTE : FILE This file contains the Toolbox strings -->
 <!-- LOCALIZATION NOTE : FILE Do not translate key -->
 
 <!ENTITY closeCmd.key  "W">
 
 <!ENTITY toolboxCloseButton.tooltip    "Zavrieť Vývojárske nástroje">
 <!ENTITY toolboxOptionsButton.key      "o">
+<!ENTITY toolboxNextTool.key           "]">
+<!ENTITY toolboxPreviousTool.key       "[">
 
 <!-- LOCALIZATION NOTE (options.context.advancedSettings): This is the label for
   -  the heading of the advanced settings group in the options panel. -->
 <!ENTITY options.context.advancedSettings "Rozšírené nastavenia">
 
 <!-- LOCALIZATION NOTE (options.context.requiresRestart2): This is the requires
   -  restart label at right of settings that require a browser restart to be
   -  effective. -->
@@ -74,8 +76,20 @@
 <!ENTITY options.webconsole.label            "Webová konzola">
 
 <!-- LOCALIZATION NOTE (options.enablePersistentLogging.label): This is the
   -  label for the checkbox that toggles persistent logs in the Web Console,
   -  i.e. devtools.webconsole.persistlog a boolean preference in about:config,
   -  in the options panel. -->
 <!ENTITY options.enablePersistentLogging.label    "Povoliť trvalé záznamy">
 <!ENTITY options.enablePersistentLogging.tooltip  "Ak povolíte túto možnosť, Webová konzola nebude vymazávať výstup pri každej návšteve novej stránky">
+
+<!-- LOCALIZATION NOTE (options.profiler.label): This is the label for the
+  -  heading of the group of JavaScript Profiler preferences in the options
+  -  panel. -->
+<!ENTITY options.profiler.label            "Nástroj na profilovanie JavaScriptu">
+
+<!-- LOCALIZATION NOTE (options.showPlatformData.label): This is the
+  -  label for the checkbox that toggles the display of the platform data in the,
+  -  Profiler i.e. devtools.profiler.ui.show-platform-data a boolean preference
+  -  in about:config, in the options panel. -->
+<!ENTITY options.showPlatformData.label    "Zobraziť údaje o platforme Gecko">
+<!ENTITY options.showPlatformData.tooltip  "Ak povolíte túto možnosť, správy Nástroja na profilovanie JavaScriptu budú obsahova symboly platformy Gecko">
--- a/browser/chrome/browser/newTab.dtd
+++ b/browser/chrome/browser/newTab.dtd
@@ -1,10 +1,10 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!-- These strings are used in the about:newtab page -->
 <!ENTITY newtab.pageTitle "Nová karta">
-<!ENTITY newtab.undo.removedLabel "Náhľad odstránený">
-<!ENTITY newtab.undo.undoButton "Späť">
-<!ENTITY newtab.undo.restoreButton "Obnoviť všetko">
+<!ENTITY newtab.undo.removedLabel "Náhľad bol odstránený">
+<!ENTITY newtab.undo.undoButton "Vrátiť späť">
+<!ENTITY newtab.undo.restoreButton "Obnoviť všetky">
 <!ENTITY newtab.undo.closeTooltip "Skryť">
--- a/browser/chrome/browser/pageInfo.dtd
+++ b/browser/chrome/browser/pageInfo.dtd
@@ -53,27 +53,17 @@
 <!ENTITY  permTab               "Povolenia">
 <!ENTITY  permTab.accesskey     "P">
 <!ENTITY  permUseDefault        "Použiť predvolené">
 <!ENTITY  permAskAlways         "Vždy sa opýtať">
 <!ENTITY  permAllow             "Povoliť">
 <!ENTITY  permAllowSession      "Povoliť pre reláciu">
 <!ENTITY  permBlock             "Blokovať">
 <!ENTITY  permissionsFor        "Povolenia pre:">
-<!ENTITY  permImage             "Načítavanie obrázkov">
-<!ENTITY  permPopup             "Otváranie vyskakovacích okien">
-<!ENTITY  permCookie            "Nastavovanie cookies">
-<!ENTITY  permNotifications     "Zobrazovanie upozornení">
-<!ENTITY  permInstall           "Inštalovanie rozšírení alebo tém">
-<!ENTITY  permGeo               "Prezradenie polohy">
 <!ENTITY  permPlugins           "Aktivácia zásuvných modulov">
-<!ENTITY  permFullscreen        "Prechod do režimu Na celú obrazovku">
-<!ENTITY  permPointerLock2      "Skrytie kurzora">
-
-<!ENTITY  permIndexedDB              "Správa úložiska režimu offline">
 <!ENTITY  permClearStorage           "Vymazať úložisko">
 <!ENTITY  permClearStorage.accesskey "V">
 
 <!ENTITY  securityTab           "Zabezpečenie">
 <!ENTITY  securityTab.accesskey "Z">
 <!ENTITY  securityHeader        "Informácie o zabezpečení tejto stránky">
 <!ENTITY  securityView.certView "Zobraziť certifikát">
 <!ENTITY  securityView.accesskey "c">
--- a/browser/chrome/browser/pageInfo.properties
+++ b/browser/chrome/browser/pageInfo.properties
@@ -49,8 +49,10 @@ securityOneVisit=Áno, raz
 securityNVisits=Áno, celkom %S krát
 
 # LOCALIZATION NOTE: The next string is for the disk usage of the
 # database
 #   e.g. indexedDBUsage : "50.23 MB"
 #   %1$S = size (in bytes or megabytes, ...)
 #   %2$S = unit of measure (bytes, KB, MB, ...)
 indexedDBUsage=Táto webová stránka využíva %1$S %2$S priestoru
+
+permissions.useDefault=Použiť predvolené
--- a/browser/chrome/browser/places/places.properties
+++ b/browser/chrome/browser/places/places.properties
@@ -52,17 +52,17 @@ tabs.openWarningTitle=Potvrdenie otvoren
 tabs.openWarningMultipleBranded=Chystáte sa otvoriť niekoľko kariet naraz (celkom %S). Toto môže spomaliť %S počas ich načítavania. Naozaj chcete pokračovať?
 tabs.openButtonMultiple=Otvoriť karty
 tabs.openWarningPromptMeBranded=Upozorniť ma v prípade, že otvorenie viacerých kariet môže spomaliť %S
 
 SelectImport=Import súboru záložiek
 EnterExport=Export súboru záložiek
 
 detailsPane.noItems=Žiadne položky
-# LOCALIZATION NOTE (detailsPane.itemsCountLabel): Semi-colon list of plural forms.
+# LOCALIZATION NOTE (detailsPane.itemsCountLabel): Semicolon-separated list of plural forms.
 # See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # #1 number of items
 # example: 111 items
 detailsPane.itemsCountLabel=Jedna položka;#1 položky;#1 položiek
 
 # SK_NOTE mostVisitedTitle: Toolbar button with Najnavštevovanejšie doesn't fit in Linux/Mac
 mostVisitedTitle=Najobľúbenejšie
 recentlyBookmarkedTitle=Naposledy pridané
--- a/browser/chrome/browser/preferences/aboutPermissions.properties
+++ b/browser/chrome/browser/preferences/aboutPermissions.properties
@@ -1,9 +1,13 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# LOCALIZATION NOTE (visitCount): #1 is the number of history visits for a site
+# LOCALIZATION NOTE (visitCount): Semicolon-separated list of plural forms.
+# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
+# #1 is the number of history visits for a site
 visitCount=#1 návšteva;#1 návštevy;#1 návštev
 
+# LOCALIZATION NOTE (passwordsCount, cookiesCount): Semicolon-separated list of plural forms.
+# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
 passwordsCount=Pre túto stránku je uložené #1 heslo.;Pre túto stránku sú uložené #1 heslá.;Pre túto stránku je uložených #1 hesiel.
 cookiesCount=Pre túto stránku je uložené #1 súbor cookies.;Pre túto stránku sú uložené #1 súbory cookies.;Pre túto stránku je uložených #1 súborov cookies.
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/sitePermissions.properties
@@ -0,0 +1,19 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+allow = Povoliť
+allowForSession = Povoliť pre reláciu
+block = Zablokovať
+alwaysAsk = Vždy sa opýtať
+
+permission.cookie.label = Nastavovanie cookies
+permission.desktop-notification.label = Zobrazovanie upozornení
+permission.image.label = Načítavanie obrázkov
+permission.install.label = Inštalovanie doplnkov
+permission.popup.label = Otváranie vyskakovacích okien
+permission.geo.label = Prístup k údajom o polohe
+permission.indexedDB.label = Správa úložiska režimu offline
+permission.fullscreen.label = Prechod do režimu Na celú obrazovku
+permission.pointerLock.label = Skrytie kurzora myši
+
--- a/browser/chrome/browser/syncSetup.properties
+++ b/browser/chrome/browser/syncSetup.properties
@@ -8,36 +8,37 @@ button.syncOptionsCancel.label = Zrušiť
 
 invalidEmail.label          = Neplatná e-mailová adresa
 serverInvalid.label         = Zadajte platnú adresu URL servera
 usernameNotAvailable.label  = Meno sa už používa
 
 verifying.label = Overuje sa…
 
 # LOCALIZATION NOTE (additionalClientCount.label):
-# Semi-colon list of plural forms. See:
+# Semicolon-separated list of plural forms. See:
 # http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # #1 is the number of additional clients (was %S for a short while, use #1 instead, even if both work)
 additionalClientCount.label = a ďalšie zariadenie;a ďalšie #1 zariadenia;a ďalších #1 zariadení
 # LOCALIZATION NOTE (bookmarksCount.label):
-# Semi-colon list of plural forms. See:
+# Semicolon-separated list of plural forms. See:
 # http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # #1 is the number of bookmarks (was %S for a short while, use #1 instead, even if both work)
 bookmarksCount.label        = #1 záložka;#1 záložky;#1 záložiek
 # LOCALIZATION NOTE (historyDaysCount.label):
-# Semi-colon list of plural forms. See:
+# Semicolon-separated list of plural forms. See:
 # http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # #1 is the number of days (was %S for a short while, use #1 instead, even if both work)
 historyDaysCount.label      = #1 deň histórie prehliadania;#1 dni histórie prehliadania;#1 dní histórie prehliadania
 # LOCALIZATION NOTE (passwordsCount.label):
-# Semi-colon list of plural forms. See:
+# Semicolon-separated 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 heslo;#1 heslá;#1 hesiel
-# LOCALIZATION NOTE (addonsCount.label):
+# LOCALIZATION NOTE (addonsCount.label): Semicolon-separated list of plural forms.
+# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # #1 is the number of add-ons, see the link above for forms
 addonsCount.label        = #1 doplnok;#1 doplnky;#1 doplnkov
 
 save.recoverykey.title = Uloženie Obnovovacieho kľúča
 save.recoverykey.defaultfilename = Obnovovaci_kluc_Firefoxu.html
 
 newAccount.action.label = Služba Firefox Sync je teraz nastavené tak, aby automaticky synchronizovala všetky údaje prehliadača.
 newAccount.change.label = Zvolením Možností synchronizácie si môžete určiť, čo presne chcete synchronizovať.
--- a/dom/chrome/accessibility/AccessFu.properties
+++ b/dom/chrome/accessibility/AccessFu.properties
@@ -73,17 +73,39 @@ definition     =       definícia
 textarea       =       textové pole
 
 # More sophisticated object descriptions
 headingLevel   =       nadpis úrovne %S
 
 # more sophisticated list announcement
 listStart      =       Prvá položka
 listEnd        =       Posledná položka
-listItemCount  =       Položiek: %S
+listItemsCount =       1 položka;#1 položky;#1 položiek
+
+# Landmark announcements
+banner         =       banner
+complementary  =       doplnkový
+contentinfo    =       informácia o obsahu
+main           =       hlavné
+navigation     =       navigácia
+search         =       vyhľadávanie
+
+# Description of a table or grid:
+# 1 is a dynamically retrieved localized role of either 'table' or 'grid'.
+# 2 is the number of columns within the table.
+# 3 is the number of rows within the table or grid.
+tableInfo = %S s %S a %S
+tableColumnInfo = 1 stĺpec;#1 stĺpce;#1 stĺpcov
+tableRowInfo = 1 riadok;#1 riadky;#1 riadkov
+
+# table or grid cell information
+columnInfo = Stĺpec %S
+rowInfo = Riadok %S
+spansColumns = spája %S stĺpce
+spansRows = spája %S riadky
 
 # Invoked actions
 jumpAction     =      skočené
 pressAction    =      stlačené
 checkAction    =      označené
 uncheckAction  =      neoznačené
 selectAction   =      zvolené
 openAction     =      otvorené
@@ -116,16 +138,17 @@ stateHasPopup    =    má vyskakovacie okno
 editingMode    =      úpravy
 navigationMode =      navigácia
 
 # Quick navigation modes
 quicknav_Simple      = Predvolené
 quicknav_Anchor      = Kotvy
 quicknav_Button      = Tlačidlá
 quicknav_Combobox    = Rozbaľovacie zoznamy
+quicknav_Landmark    = Orientačné body
 quicknav_Entry       = Položky
 quicknav_FormElement = Položky formulárov
 quicknav_Graphic     = Obrázky
 quicknav_Heading     = Hlavičky
 quicknav_ListItem    = Položky zoznamu
 quicknav_Link        = Odkazy
 quicknav_List        = Zoznamy
 quicknav_PageTab     = Karty stránky
@@ -136,8 +159,13 @@ quicknav_Checkbox    = Označovacie políčka
 
 # Shortened role names for braille
 linkAbbr           =       lnk
 pushbuttonAbbr     =       btn
 passwordtextAbbr   =       passwdtxt
 imagemapAbbr       =       imgmap
 figureAbbr         =       fig
 textareaAbbr       =       txtarea
+tableAbbr          =       tbl
+tableInfoAbbr = %S %S %S
+tableColumnInfoAbbr = #1c;#1c
+tableRowInfoAbbr = #1r;#1r
+cellInfoAbbr = c%Sr%S
--- a/dom/chrome/dom/dom.properties
+++ b/dom/chrome/dom/dom.properties
@@ -11,16 +11,18 @@ DebugScriptButton=Otvoriť v ladiacom nástroji
 WaitForScriptButton=Počkať
 DontAskAgain=&Nabudúce sa už nepýtať
 JSURLLoadBlockedWarning=Pokus o načítanie javascript: URL z jedného servera \nv okne zobrazujúcom stránku z iného servera\nbolo zablokované Správcom zabezpečenia.
 WindowCloseBlockedWarning=Skripty nemôžu zavrieť okná, ktoré neboli otvorené skriptom.
 OnBeforeUnloadTitle=Naozaj?
 OnBeforeUnloadMessage=Táto stránka vás žiada o potvrdenie jej opustenia - zadané údaje nemuseli byť uložené.
 OnBeforeUnloadStayButton=Zostať na stránke
 OnBeforeUnloadLeaveButton=Opustiť stránku
+UseOfCaptureEventsWarning=Používanie captureEvents() je zavrhnuté. Aktualizujte svoj kód a používajte radšej metódu addEventListener() zo špecifikácie DOM 2. Ďalšie informácie nájdete na stránke http://developer.mozilla.org/en/docs/DOM:element.addEventListener
+UseOfReleaseEventsWarning=Používanie releaseEvents() je zavrhnuté. Aktualizujte svoj kód a používajte radšej metódu removeEventListener() zo špecifikácie DOM 2. Ďalšie informácie nájdete na stránke http://developer.mozilla.org/en/docs/DOM:element.removeEventListener
 UseOfDOM3LoadMethodWarning=Udalosť Document.load() je zavrhnutá. Aktualizujte svoj kód použitím objektu DOM XMLHttpRequest. Ďalšie informácie získate na stránke https://developer.mozilla.org/en/XMLHttpRequest
 UnexpectedCanvasVariantStyle=canvas: pokus o nastavenie strokeStyle alebo fillStyle na hodnotu, ktorá je buď reťazec, CanvasGradient alebo CanvasPattern, bol ignorovaný.
 EmptyGetElementByIdParam=Prázdny reťazec odovzdaný pre getElementById().
 LowMemoryTitle=Upozornenie: Nedostatok pamäte
 LowMemoryMessage=Skript tejto stránky bol zastavený kvôli nedostatku voľnej pamäte.
 SpeculationFailed=Pomocou metódy document.write() bol vytvorený nevyvážený strom, čo spôsobuje opätovné spracovávanie údajov zo siete. Ďalšie informácie je možné nájsť na stránke https://developer.mozilla.org/en/Optimizing_Your_Pages_for_Speculative_Parsing
 DocumentWriteIgnored=Volanie metódy document.write() z asynchrónne načítaného externého skriptu bolo ignorované.
 FormValidationTextTooLong=Tento text musíte skrátiť. Maximálny povolený počet znakov: %S, aktuálne využívate: %S.
--- a/dom/chrome/layout/HtmlForm.properties
+++ b/dom/chrome/layout/HtmlForm.properties
@@ -22,8 +22,9 @@ AllSupportedTypes=Všetky podporované typy
 NoFileSelected=Nie je zvolený súbor.
 # LOCALIZATION NOTE (NoFilesSelected): this string is shown on a
 # <input type='file' multiple> when there is no file selected yet.
 NoFilesSelected=Nie sú zvolené súbory.
 # LOCALIZATION NOTE (XFilesSelected): this string is shown on a
 # <input type='file' multiple> when there are more than one selected file.
 # %S will be a number greater or equal to 2.
 XFilesSelected=Počet zvolených súborov: %S
+ColorPicker=Zvoľte farbu
--- a/dom/chrome/layout/css.properties
+++ b/dom/chrome/layout/css.properties
@@ -94,17 +94,17 @@ PEColorLightnessEOF=intenzita
 PEColorOpacityEOF=priehľadnosť hodnoty farby
 PEExpectedNumber=Očakávané číslo, ale bolo nájdené '%1$S'.
 PEExpectedCloseParen=Očakávaný znak ')', ale bolo nájdené '%1$S'.
 PEDeclEndEOF=';' alebo '}'  pre ukončenie deklarácie
 PEParseDeclarationNoColon=Očakávaný znak ':', ale bolo nájdené '%1$S'.
 PEParseDeclarationDeclExpected=Očakávaná deklarácia, ale bolo nájdené '%1$S'.
 PEEndOfDeclEOF=koniec deklarácie
 PEImportantEOF=dôležité
-PEExpectedImportant=Očakávaný 'important', ale bolo nájdené '%1$S'.
+PEExpectedImportant=Očakáva sa 'important', ale bolo nájdené '%1$S'.
 PEBadDeclEnd=Očakávaný znak ';' pre ukončenie deklarácie, ale bolo nájdené '%1$S'.
 PEBadDeclOrRuleEnd2=Očakávaný znak ';' alebo '}' na ukončenie deklarácie, ale bolo nájdené '%1$S'.
 PEInaccessibleProperty2=Nie je možné určiť hodnotu internej vlastnosti.
 PECommentEOF=koniec komentára
 SEUnterminatedString=Nájdený neuzatvorený reťazec '%1$S'.
 PEFontDescExpected=Očakávaný popisovač písma, ale bolo nájdené '%1$S'.
 PEUnknownFontDesc=Neznámy popisovač '%1$S' v pravidle @font-face.
 PEMQExpectedExpressionStart=Očakávaný znak '(' ako začiatok požiadavky médií, ale bolo nájdené '%1$S'.
@@ -132,8 +132,13 @@ PESupportsConditionStartEOF2='not', '(' 
 PESupportsConditionInParensEOF=')'
 PESupportsConditionNotEOF='not'
 PESupportsWhitespaceRequired=Po 'not', 'and' alebo 'or' sa očakáva medzera.
 PESupportsConditionExpectedOpenParenOrFunction=Počas spracovania podmienky v pravidle supports bol očakávaný znak '(' alebo funkcia, ale bolo nájdené '%1$S'.
 PESupportsConditionExpectedCloseParen=Počas spracovania podmienky v pravidle supports bol očakávaný znak ')', ale bolo nájdené '%1$S'.
 PESupportsConditionExpectedStart2=Počas spracovania podmienky v pravidle supports sa očakávalo 'not', '(' alebo funkcia, ale bolo nájdené '%1$S'.
 PESupportsConditionExpectedNot=Počas spracovania podmienky v pravidle supports sa očakávalo 'not', ale bolo nájdené '%1$S'.
 PESupportsGroupRuleStart=Na začiatku pravidla @supports bol očakávaný znak '{', ale bolo nájdené '%1$S'.
+PEFilterEOF=filter
+PEExpectedNoneOrURL=Očakáva sa 'none' alebo adresa URL, ale bolo nájdené '%1$S'.
+PEExpectedNoneOrURLOrFilterFunction=Očakáva sa 'none', adresa URL alebo filtrovacia funkcia, ale bolo nájdené '%1$S'.
+PEExpectedNonnegativeNP=Očakáva sa nezáporné číslo alebo percentá.
+PEFilterFunctionArgumentsParsingError=Chyba pri spracovaní parametrov filtrovacej funkcie.
--- a/dom/chrome/security/security.properties
+++ b/dom/chrome/security/security.properties
@@ -4,8 +4,10 @@ BlockMixedDisplayContent = Blokované načítanie zmiešaného obsahu na zobrazenie "%1$S"
 BlockMixedActiveContent = Blokované načítanie zmiešaného aktívneho obsahu "%1$S"
 
 # CSP
 ReportOnlyCSPIgnored=Report-only CSP policy will be ignored because there are other non-report-only CSP policies applied.
 # LOCALIZATION NOTE: Do not translate "X-Content-Security-Policy", "X-Content-Security-Policy-Report-Only",  "Content-Security-Policy" or "Content-Security-Policy-Report-Only"
 OldCSPHeaderDeprecated=Hlavičky X-Content-Security-Policy a X-Content-Security-Report-Only budú v budúcnosti zavrhnuté. Používajte radšej hlavičky Content-Security-Policy a Content-Security-Report-Only so syntaxou podľa špecifikácie CSP.
 # LOCALIZATION NOTE: Do not translate "X-Content-Security-Policy/Report-Only" or "Content-Security-Policy/Report-Only"
 BothCSPHeadersPresent=Táto stránka obsahuje hlavičku X-Content-Security-Policy/Report-Only ako aj hlavičku Content-Security-Policy/Report-Only. Hlavička X-Content-Security-Policy/Report-Only bude ignorovaná.
+# LOCALIZATION NOTE: Do not translate "Strict-Transport-Security" or "HSTS"
+InvalidSTSHeaders=Stránka má definovanú neplatnú hlavičku Strict-Transport-Security.
--- a/extensions/irc/chrome/chatzilla.properties
+++ b/extensions/irc/chrome/chatzilla.properties
@@ -29,17 +29,17 @@
 #
 # Note: the ChatZilla version and expected locale versions may not always be
 #       the same. For example, if only non-locale changes have been made, the
 #       expected locale version will stay the same. This is to make using
 #       localisations between versions easier.
 #
 ### End of notes ###
 
-locale.version = 0.9.90
+locale.version = 0.9.90.1
 locale.error = Používate ChatZillu %1$S, ktorá vyžaduje verziu prekladu %2$S. Verzia aktuálne vybraného prekladu (%3$S) je %4$S, preto sa môžu vyskytnúť problémy s činnosťou ChatZilly.\n\nOdporúča sa, aby ste aktualizovali alebo odstránili uvedený preklad.
 locale.authors = Vlado Valaštiak (wladow);Ján Kendi (Jacen)
 
 # Misc
 
 unknown=<neznámy>
 none=<žiadny>
 na=<nedostupný>
@@ -103,16 +103,17 @@ cmd.channel-motif.params = [<motif> [<ch
 cmd.channel-motif.help   = Nastaví súbor s CSS pravidlami pre správy daného kanála. <motif> môže byť tiež adresa URL odkazujúca na súbor .css alebo skratka "dark" alebo "light". Ak namiesto <motif> zadáte znak ('-'), bude motív vrátený na motív definovaný sieťou. Ak nezadáte <channel>, potom sa bude brať do úvahy kanál aktuálny. Ďalšie informácie o tom, ako meniť motív ChatZilly, nájdete na domovských stránkach <ttp://www.mozilla.org/projects/rt-messaging/chatzilla/>. Pozrite tiež |motif|.
 
 cmd.channel-pref.params = [<pref-name> [<pref-value> [<delete-pref> [<channel>]]]]
 cmd.channel-pref.help    = Nastaví predvoľbu <pref-name> pre daný kanál na hodnotu <pref-value>. Ak nezadáte <pref-value>, bude zobrazená aktuálna hodnota pre <pref-name>. Ak nezadáte ani <pref-name> ani <pref-value>, budú zobrazené všetky predvoľby. Ak ako <pref-value> zadáte znak mínus ('-'), bude predvoľbe vrátená jej pôvodná hodnota.
 
 cmd.clear-view.label  = Vymazať &kartu
 cmd.clear-view.params = [<view>]
 cmd.clear-view.help = Vymaže aktuálnu kartu a všetok jej obsah.
+cmd.clear-view.key = accel L
 
 cmd.client.help = Nastaví kartu ``*klient*'' ako aktuálnu. Ak bola karta ``*klient*'' odstránená, bude znova vytvorená.
 
 cmd.cmd-docommand.params = <cmd-name>
 cmd.cmd-docommand.help   =
 
 cmd.cmd-undo.label  = &Späť
 cmd.cmd-undo.key    = accel Z
--- a/mail/chrome/messenger/imapMsgs.properties
+++ b/mail/chrome/messenger/imapMsgs.properties
@@ -2,413 +2,241 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 #
 # The following are used by the imap code to display progress/status/error messages
 #
 
 # Status - opening folder
-## @name IMAP_STATUS_SELECTING_MAILBOX
-## @loc None
-5000=Otvára sa priečinok %S…
+imapStatusSelectingMailbox=Otvára sa priečinok %S…
 
 # Status - create folder
-## @name IMAP_STATUS_CREATING_MAILBOX
-## @loc None
-5001=Vytvára sa priečinok…
+imapStatusCreatingMailbox=Vytvára sa priečinok…
 
 # Status - deleting a folder
-## @name IMAP_STATUS_DELETING_MAILBOX
-## @loc None
-# LOCALIZATION NOTE (Error 5002): The "%S" below should not be translated.
+# LOCALIZATION NOTE (imapStatusDeletingMailbox): The "%S" below should not be translated.
 # Instead, insert "%S" in your translation where you wish to display the name
 # of the folder being deleted.
-5002=Odstraňuje sa priečinok %S…
+imapStatusDeletingMailbox=Odstraňuje sa priečinok %S…
 
 # Status - renaming mailbox
-## @name IMAP_STATUS_RENAMING_MAILBOX
-## @loc None
-# LOCALIZATION NOTE (Error 5003): The "%S" below should not be translated.
+# LOCALIZATION NOTE (imapStatusRenamingMailbox): The "%S" below should not be translated.
 # Instead, insert "%S" in your translation where you wish to display the name
 # of the folder being renamed.
-5003=Premenováva sa priečinok %S…
+imapStatusRenamingMailbox=Premenováva sa priečinok %S…
 
 # Status - looking for mailboxes
-## @name IMAP_STATUS_LOOKING_FOR_MAILBOX
-## @loc None
-5004=Hľadajú sa priečinky…
+imapStatusLookingForMailbox=Hľadajú sa priečinky…
 
 # Status - subscribing to mailbox
-## @name IMAP_STATUS_SUBSCRIBE_TO_MAILBOX
-## @loc None
-# LOCALIZATION NOTE (Error 5005): The "%S" below should not be translated.
+# LOCALIZATION NOTE (imapStatusSubscribeToMailbox): The "%S" below should not be translated.
 # Instead, insert "%S" in your translation where you wish to display the name
 # of the folder being subscribed to.
-5005=Prihlasovanie sa k priečinku %S…
+imapStatusSubscribeToMailbox=Prihlasovanie sa k priečinku %S…
 
 # Status - unsubscribing from mailbox
-## @name IMAP_STATUS_UNSUBSCRIBE_MAILBOX
-## @loc None
-# LOCALIZATION NOTE (Error 5005): The "%S" below should not be translated.
+# LOCALIZATION NOTE (imapStatusUnsubscribeMailbox): The "%S" below should not be translated.
 # Instead, insert "%S" in your translation where you wish to display the name
 # of the folder being unsubscribed from.
-5006=Odhlasovanie sa z priečinku %S…
+imapStatusUnsubscribeMailbox=Odhlasovanie sa z priečinku %S…
 
 # Status - searching imap folder
-## @name IMAP_STATUS_SEARCH_MAILBOX
-## @loc None
-5007=Prehľadáva sa priečinok…
-
-# Status - getting message info
-## @name IMAP_STATUS_MSG_INFO
-## @loc None
-5008=Získavanie informácií o správe…
+imapStatusSearchMailbox=Prehľadáva sa priečinok…
 
 # Status - closing a folder
-## @name IMAP_STATUS_CLOSE_MAILBOX
-## @loc None
-5009=Zatvára sa priečinok…
+imapStatusCloseMailbox=Zatvára sa priečinok…
 
 # Status - compacting a folder
-## @name IMAP_STATUS_EXPUNGING_MAILBOX
-## @loc None
-5010=Vykonáva sa údržba priečinka…
+imapStatusExpungingMailbox=Vykonáva sa údržba priečinka…
 
 # Status - logging out
-## @name IMAP_STATUS_LOGGING_OUT
-## @loc None
-5011=Odhlasovanie…
+imapStatusLoggingOut=Odhlasovanie…
 
 # Status - checking server capabilities
-## @name IMAP_STATUS_CHECK_COMPAT
-## @loc None
-5012=Zisťovanie možností servera…
+imapStatusCheckCompat=Zisťovanie možností servera…
 
 # Status - logging on
-## @name IMAP_STATUS_SENDING_LOGIN
-## @loc None
-5013=Odosielajú sa prihlasovacie údaje…
+imapStatusSendingLogin=Odosielajú sa prihlasovacie údaje…
 
 # Status - auth logon
-## @name IMAP_STATUS_SENDING_AUTH_LOGIN
-## @loc None
-5014=Odosielajú sa prihlasovacie údaje…
+imapStatusSendingAuthLogin=Odosielajú sa prihlasovacie údaje…
 
-## @name IMAP_DOWNLOADING_MESSAGE
-## @loc None
-5015=Preberá sa správa…
+imapDownloadingMessage=Preberá sa správa…
 
-## @name IMAP_GETTING_ACL_FOR_FOLDER
-## @loc None
-# LOCALIZATION NOTE (Error 5029): Do not translate the word "ACL" below.
-5029=Získavajú sa informácie o prístupových právach ACL…
+# LOCALIZATION NOTE (imapGettingACLForFolder): Do not translate the word "ACL" below.
+imapGettingACLForFolder=Získavajú sa informácie o prístupových právach ACL…
 
-## @name IMAP_GETTING_SERVER_INFO
-## @loc None
-5030=Získavajú sa informácie o nastavení servera…
+imapGettingServerInfo=Získavajú sa informácie o nastavení servera…
 
-## @name IMAP_GETTING_MAILBOX_INFO
-## @loc None
-5031=Získavajú sa informácie o nastavení schránky…
+imapGettingMailboxInfo=Získavajú sa informácie o nastavení schránky…
 
-## @name IMAP_EMPTY_MIME_PART
-## @loc None
-5032=Táto časť tela správy bude prevzatá na požiadanie.
+imapEmptyMimePart=Táto časť tela správy bude prevzatá na požiadanie.
 
-## @name IMAP_RECEIVING_MESSAGE_HEADERS_OF
-## @loc None
-# LOCALIZATION NOTE (Error 5036): Do not translate the word "%1$S", "%2$lu" or "%3$lu" below.
+# LOCALIZATION NOTE (imapReceivingMessageHeaders): Do not translate the word "%1$S", "%2$lu" or "%3$lu" below.
 # Place the word %1$S in your translation where the name of the server should appear.
 # Place the word %2$lu where the number of the header currently being downloaded should appear.
 # Place the word %3$lu where the number of headers should appear.
-5036=%S - Prijímajú sa hlavičky správ (%lu z %lu)
+imapReceivingMessageHeaders=%S - Prijímajú sa hlavičky správ (%lu z %lu)
 
-## @name IMAP_RECEIVING_MESSAGE_FLAGS_OF
-## @loc None
-# LOCALIZATION NOTE (Error 5037): Do not translate the word "%1$S", "%2$lu" or "%3$lu" below.
+# LOCALIZATION NOTE (imapReceivingMessageFlags): Do not translate the word "%1$S", "%2$lu" or "%3$lu" below.
 # Place the word %1$S in your translation where the name of the server should appear.
 # Place the word %2$lu where the number of the flag currently being downloaded should appear.
 # Place the word %3$lu where the number of flags should appear.
-5037=%S - Prijímajú sa príznaky správ (%lu z %lu)
+imapReceivingMessageFlags=%S - Prijímajú sa príznaky správ (%lu z %lu)
 
-## @name IMAP_DELETING_MESSAGES
-## @loc None
-5038=Odstraňujú sa správy…
+imapDeletingMessages=Odstraňujú sa správy…
 
-## @name IMAP_DELETING_MESSAGE
-## @loc None
-5039=Odstraňuje sa správa…
+imapDeletingMessage=Odstraňuje sa správa…
 
-## @name IMAP_MOVING_MESSAGES_TO
-## @loc None
-# LOCALIZATION NOTE (Error 5040): Do not translate the word "%S" below.
+# LOCALIZATION NOTE (imapMovingMessages): Do not translate the word "%S" below.
 # Place the word %S in your translation where the name of the folder should appear.
-5040=Presúvanie správ do %S…
+imapMovingMessages=Presúvanie správ do %S…
 
-## @name IMAP_MOVING_MESSAGE_TO
-## @loc None
-# LOCALIZATION NOTE (Error 5041): Do not translate the word "%S" below.
+# LOCALIZATION NOTE (imapMovingMessage): Do not translate the word "%S" below.
 # Place the word %S in your translation where the name of the folder should appear.
-5041=Presúvanie správy do %S…
+imapMovingMessage=Presúvanie správy do %S…
 
-## @name IMAP_COPYING_MESSAGES_TO
-## @loc None
-# LOCALIZATION NOTE (Error 5042): Do not translate the word "%S" below.
+# LOCALIZATION NOTE (imapCopyingMessages): Do not translate the word "%S" below.
 # Place the word %S in your translation where the name of the folder should appear.
-5042=Kopírovanie správ do %S…
+imapCopyingMessages=Kopírovanie správ do %S…
 
-## @name IMAP_COPYING_MESSAGE_TO
-## @loc None
-# LOCALIZATION NOTE (Error 5043): Do not translate the word "%S" below.
+# LOCALIZATION NOTE (imapCopyingMessage): Do not translate the word "%S" below.
 # Place the word %S in your translation where the name of the folder should appear.
-5043=Kopírovanie správy do %S…
+imapCopyingMessage=Kopírovanie správy do %S…
 
-## @name IMAP_FOLDER_RECEIVING_MESSAGE_OF
-## @loc None
-# LOCALIZATION NOTE (Error 5045): Do not translate the word "%S" or "%lu" below.
+# LOCALIZATION NOTE (imapFolderReceivingMessageOf): Do not translate the word "%S" or "%lu" below.
 # Place the word %S in your translation where the name of the folder should appear.
 # Place the word %lu where the number of headers should appear.
-5045=%S - Prijímajú sa správy (%lu z %lu)
+imapFolderReceivingMessageOf=%S - Prijímajú sa správy (%lu z %lu)
 
-## @name IMAP_DISCOVERING_MAILBOX
-## @loc None
-# LOCALIZATION NOTE (Error 5046): Do not translate the word "%S" below.
+# LOCALIZATION NOTE (imapDiscoveringMailbox): Do not translate the word "%S" below.
 # Place the word %S in your translation where the name of the folder should appear.
-5046=Nájdený priečinok: %S
+imapDiscoveringMailbox=Nájdený priečinok: %S
 
-## @name IMAP_ENTER_PASSWORD_PROMPT
-## @loc None
-# LOCALIZATION NOTE (Error 5047): Do not translate the word %S below.
+# LOCALIZATION NOTE (imapEnterPasswordPrompt): Do not translate the word %S below.
 # Place the word "%S" in your translation where the email address
 # or the username should appear
-5047=Zadajte heslo pre %S:
-
-## @name IMAP_SERVER_NOT_IMAP4
-## @loc None
-# LOCALIZATION NOTE (Error 5048): Do not translate the word "IMAP4" below.
-5048=Server %S neposkytuje služby IMAP4.
+imapEnterPasswordPrompt=Zadajte heslo pre %S:
 
-## @name IMAP_SERVER_SAID
-## @loc None
-5049=Posledný príkaz sa nepodarilo vykonať. Server oznámil:
+# LOCALIZATION NOTE (imapServerNotImap4): Do not translate the word "IMAP4" below.
+imapServerNotImap4=Server %S neposkytuje služby IMAP4.
 
-## @name IMAP_DONE
-## @loc None
-5050=
+# This is intentionally left blank.
+imapDone=
 
-## @name IMAP_ENTER_PASSWORD_PROMPT_TITLE
-## @loc None
-5051=Poštový server vyžaduje heslo
+imapEnterPasswordPromptTitle=Poštový server vyžaduje heslo
 
-## @name IMAP_UNKNOWN_HOST_ERROR
-## @loc None
-5052=Nepodarilo sa spojiť so serverom %S.
+imapUnknownHostError=Nepodarilo sa spojiť so serverom %S.
 
-## @name IMAP_IMAP_CONNECTION_REFUSED_ERROR
-## @loc None
-5053=Nepodarilo sa pripojiť k serveru %S; spojenie odmietnuté.
+imapConnectionRefusedError=Nepodarilo sa pripojiť k serveru %S; spojenie odmietnuté.
 
-## @name IMAP_NET_TIMEOUT_ERROR
-## @loc None
-5054=Vypršal čas pre pripojenie k serveru %S.
+imapNetTimeoutError=Vypršal čas pre pripojenie k serveru %S.
 
 # Status - no messages to download
-## @name IMAP_NO_NEW_MESSAGES
-## @loc None
-5056=Server neobsahuje žiadne nové správy.
+imapNoNewMessages=Server neobsahuje žiadne nové správy.
 
-## @name IMAP_DEFAULT_ACCOUNT_NAME
-## @loc None
-5057=Pošta pre %S
+imapDefaultAccountName=Pošta pre %S
 
-## @name IMAP_SPECIAL_CHAR
-## @loc None
-5065=Znak %c je na tomto IMAP serveri rezervovaný. Zvoľte iný názov.
+imapSpecialChar=Znak %c je na tomto IMAP serveri rezervovaný. Zvoľte iný názov.
 
-## @name IMAP_PERSONAL_SHARED_FOLDER_TYPE_NAME
-## @loc None
-5066=Osobný priečinok
+imapPersonalSharedFolderTypeName=Osobný priečinok
 
-## @name IMAP_PUBLIC_FOLDER_TYPE_NAME
-## @loc None
-5067=Verejný priečinok
+imapPublicFolderTypeName=Verejný priečinok
 
-## @name IMAP_OTHER_USERS_FOLDER_TYPE_NAME
-## @loc None
-5068=Priečinok iného používateľa
+imapOtherUsersFolderTypeName=Priečinok iného používateľa
 
-## @name IMAP_PERSONAL_FOLDER_TYPE_DESCRIPTION
-## @loc None
-5069=Toto je osobný poštový priečinok. Nie je zdieľaný.
+imapPersonalFolderTypeDescription=Toto je osobný poštový priečinok. Nie je zdieľaný.
 
-## @name IMAP_PERSONAL_SHARED_FOLDER_TYPE_DESCRIPTION
-## @loc None
-5070=Toto je osobný poštový priečinok. Je zdieľaný.
+imapPersonalSharedFolderTypeDescription=Toto je osobný poštový priečinok. Je zdieľaný.
 
-## @name IMAP_PUBLIC_FOLDER_TYPE_DESCRIPTION
-## @loc None
-5071=Toto je verejný priečinok.
+imapPublicFolderTypeDescription=Toto je verejný priečinok.
 
-## @name IMAP_OTHER_USERS_FOLDER_TYPE_DESCRIPTION
-## @loc None
-5072=Toto je poštový priečinok zdieľaný používateľom '%S'.
+imapOtherUsersFolderTypeDescription=Toto je poštový priečinok zdieľaný používateľom '%S'.
 
-## @name IMAP_ACL_FULL_RIGHTS
-## @loc None
-5073=Úplná kontrola
+imapAclFullRights=Úplná kontrola
 
-## @name IMAP_ACL_LOOKUP_RIGHT
-## @loc None
-5074=Prehľadávať
+imapAclLookupRight=Prehľadávať
 
-## @name IMAP_ACL_READ_RIGHT
-## @loc None
-5075=Čítať
+imapAclReadRight=Čítať
 
-## @name IMAP_ACL_SEEN_RIGHT
-## @loc None
-5076=Nastaviť stav Prečítané/Neprečítané
+imapAclSeenRight=Nastaviť stav Prečítané/Neprečítané
 
-## @name IMAP_ACL_WRITE_RIGHT
-## @loc None
-5077=Zapísať
+imapAclWriteRight=Zapísať
 
-## @name IMAP_ACL_INSERT_RIGHT
-## @loc None
-5078=Vložiť (kopírovať do)
+imapAclInsertRight=Vložiť (kopírovať do)
 
-## @name IMAP_ACL_POST_RIGHT
-## @loc None
-5079=Poslať
+imapAclPostRight=Poslať
 
-## @name IMAP_ACL_CREATE_RIGHT
-## @loc None
-5080=Vytvoriť podpriečinok
+imapAclCreateRight=Vytvoriť podpriečinok
 
-## @name IMAP_ACL_DELETE_RIGHT
-## @loc None
-5081=Vymazať správy
+imapAclDeleteRight=Vymazať správy
 
-## @name IMAP_ACL_ADMINISTER_RIGHT
-## @loc None
-5082=Spravovať priečinok
+imapAclAdministerRight=Spravovať priečinok
 
-## @name IMAP_SERVER_DOESNT_SUPPORT_ACL
-## @loc None
-5084=Tento server nepodporuje zdieľané priečinky.
+imapServerDoesntSupportAcl=Tento server nepodporuje zdieľané priečinky.
 
-## @name IMAP_ACL_EXPUNGE_RIGHT
-## @loc None
-5085=Vyčistiť (Expunge)
+imapAclExpungeRight=Vyčistiť (Expunge)
 
-## @name IMAP_SERVER_DISCONNECTED
-## @loc None
-5090=Server %S sa odpojil. Server sa možno vypína alebo je problém so sieťou.
+imapServerDisconnected=Server %S sa odpojil. Server sa možno vypína alebo je problém so sieťou.
 
 # LOCALIZATION NOTE (autoSubscribeText): %1$S is the imap folder.
-5092=Chcete sa prihlásiť k odberu priečinka %1$S?
+imapSubscribePrompt=Chcete sa prihlásiť k odberu priečinka %1$S?
 
-## @name IMAP_SERVER_DROPPED_CONNECTION
-## @loc None
-5093=Nepodarilo sa spojiť so serverom IMAP. Je možné, že bol prekročený maximálny povolený počet pripojení na tento server. Pokiaľ k tomu došlo, znížte počet pripojení v dialógovom okne Pokročilé nastavenie servera IMAP.
+imapServerDroppedConnection=Nepodarilo sa spojiť so serverom IMAP. Je možné, že bol prekročený maximálny povolený počet pripojení na tento server. Pokiaľ k tomu došlo, znížte počet pripojení v dialógovom okne Pokročilé nastavenie servera IMAP.
 
-## @name IMAP_QUOTA_STATUS_FOLDERNOTOPEN
-## @loc None
-5095=Informácie o kvóte nie sú k dispozícii, pretože priečinok nie je otvorený.
+imapQuotaStatusFolderNotOpen=Informácie o kvóte nie sú k dispozícii, pretože priečinok nie je otvorený.
 
-## @name IMAP_QUOTA_STATUS_NOTSUPPORTED
-## @loc None
-5096=Tento server nepodporuje kvóty.
+imapQuotaStatusNotSupported=Tento server nepodporuje kvóty.
 
-## @name IMAP_QUOTA_STATUS_NOQUOTA
-## @loc None
-5097=Na tomto priečinku nie sú nastavené žiadne kvóty.
+imapQuotaStatusNoQuota=Na tomto priečinku nie sú nastavené žiadne kvóty.
 
 # Out of memory
-## @name IMAP_OUT_OF_MEMORY
-## @loc None
-5100=Aplikácia má nedostatok pamäte.
+imapOutOfMemory=Aplikácia má nedostatok pamäte.
 
-## @name IMAP_COPYING_MESSAGE_OF
-## @loc None
-# LOCALIZATION NOTE (Error 5103): Do not translate the word "%S" below.
+# LOCALIZATION NOTE (imapCopyingMessageOf): Do not translate the word "%S" below.
 # Place the word %3$S in your translation where the name of the destination folder should appear.
 # Place the word %1$S where the currently copying message should appear.
 # Place the word %2$S where the total number of messages should appear.
-5103=Kopírovanie správy %1$S z %2$S do priečinka %3$S
+imapCopyingMessageOf=Kopírovanie správy %1$S z %2$S do priečinka %3$S
 
-## @name IMAP_MOVE_FOLDER_TO_TRASH
-## @loc None
-# LOCALIZATION NOTE (5105): Do not translate the word %S below.
-# "%S" is the the name of the folder.
-5105=Naozaj chcete odstrániť priečinok '%S'?
-
-## @name IMAP_DELETE_NO_TRASH
-## @loc None
-# LOCALIZATION NOTE (5106): Do not translate the word %S below.
+# LOCALIZATION NOTE (imapMoveFolderToTrash): Do not translate the word %S below.
 # "%S" is the the name of the folder.
-5106=Odstránením tohto priečinka budú odstránené všetky správy a podpriečinky, ktoré priečinok obsahuje. Túto operáciu nie je možné vrátiť späť. Naozaj chcete odstrániť priečinok '%S'?
-
-## @name IMAP_DELETE_FOLDER_DIALOG_TITLE
-## @loc None
-5107=Odstránenie priečinka
+imapMoveFolderToTrash=Naozaj chcete odstrániť priečinok '%S'?
 
-## @name IMAP_DELETE_FOLDER_BUTTON_LABEL
-## @loc None
-5108=O&dstrániť priečinok
+# LOCALIZATION NOTE (imapDeleteNoTrash): Do not translate the word %S below.
+# "%S" is the the name of the folder.
+imapDeleteNoTrash=Odstránením tohto priečinka budú odstránené všetky správy a podpriečinky, ktoré priečinok obsahuje. Túto operáciu nie je možné vrátiť späť. Naozaj chcete odstrániť priečinok '%S'?
 
-## @name IMAP_AUTH_CHANGE_ENCRYPT_TO_PLAIN_SSL
-## @loc None
-# LOCALIZATION NOTE (5110): %S is the server hostname
-5110=Server IMAP %S zdá sa nepodporuje šifrované heslá. Ak ste si práve nastavili tento účet, skúste zmeniť nastavenie 'Metóda overenia' v okne 'Nastavenia účtov | Nastavenie servera' na 'Normálne heslo'. Ak toto predtým fungovalo a teraz náhle prestalo, kontaktujte správcu e-mailového servera alebo poskytovateľa e-mailovej služby.
+imapDeleteFolderDialogTitle=Odstránenie priečinka
+
+imapDeleteFolderButtonLabel=O&dstrániť priečinok
 
-## @name IMAP_AUTH_CHANGE_PLAIN_TO_ENCRYPT
-## @loc None
-# LOCALIZATION NOTE (5111): %S is the server hostname
-5111=Server IMAP %S nepovoľuje nezašifrované heslá. Skúste zmeniť nastavenie 'Metóda overenia' v okne 'Nastavenia účtov | Nastavenie servera' na 'Zašifrované heslo'.
+# LOCALIZATION NOTE (imapAuthChangeEncryptToPlainSSL): %S is the server hostname
+imapAuthChangeEncryptToPlainSSL=Server IMAP %S zdá sa nepodporuje šifrované heslá. Ak ste si práve nastavili tento účet, skúste zmeniť nastavenie 'Metóda overenia' v okne 'Nastavenia účtov | Nastavenie servera' na 'Normálne heslo'. Ak toto predtým fungovalo a teraz náhle prestalo, kontaktujte správcu e-mailového servera alebo poskytovateľa e-mailovej služby.
 
-## @name IMAP_AUTH_CHANGE_ENCRYPT_TO_PLAIN_NO_SSL
-## @loc None
-# LOCALIZATION NOTE (5112): %S is the server hostname
-5112=Server IMAP %S zdá sa nepodporuje šifrované heslá. Ak ste si práve nastavili tento účet, skúste zmeniť nastavenie 'Metóda overenia' v okne 'Nastavenia účtov | Nastavenie servera' na 'Heslo odosielané nezabezpečene'.  Ak toto predtým fungovalo a teraz náhle prestalo, je možné, že sa niekto pokúša získať vaše heslo.
-
-## @name IMAP_AUTH_MECH_NOT_SUPPORTED
-## @loc None
-# LOCALIZATION NOTE (5113): %S is the server hostname
-5113=Server IMAP %S nepodporuje zvolenú metódu overenia. Zmeňte nastavenie 'Metóda overenia' v okne 'Nastavenia účtov | Nastavenie servera'.
+# LOCALIZATION NOTE (imapAuthChangePlainToEncrypt): %S is the server hostname
+imapAuthChangePlainToEncrypt=Server IMAP %S nepovoľuje nezašifrované heslá. Skúste zmeniť nastavenie 'Metóda overenia' v okne 'Nastavenia účtov | Nastavenie servera' na 'Zašifrované heslo'.
 
-## @name IMAP_AUTH_MECH_FAILED
-## @loc None
-# LOCALIZATION NOTE (5114): %S is the server hostname
-5114=Všetky možnosti pripojenia sa k serveru %S zlyhali. Skontrolujte zadané heslo alebo zmeňte nastavenie 'Metóda overenia' v okne 'Nastavenia účtov | Nastavenie servera'.
+# LOCALIZATION NOTE (imapAuthChangeEncryptToPlainNoSSL): %S is the server hostname
+imapAuthChangeEncryptToPlainNoSSL=Server IMAP %S zdá sa nepodporuje šifrované heslá. Ak ste si práve nastavili tento účet, skúste zmeniť nastavenie 'Metóda overenia' v okne 'Nastavenia účtov | Nastavenie servera' na 'Heslo odosielané nezabezpečene'.  Ak toto predtým fungovalo a teraz náhle prestalo, je možné, že sa niekto pokúša získať vaše heslo.
 
-## @name IMAP_AUTH_GSSAPI_FAILED
-## @loc None
-# LOCALIZATION NOTE (5115): %S is the server hostname
-5115=Tiket Kerberos/GSSAPI nebol serverom IMAP %S akceptovaný. Skontrolujte, či ste prihlásený k doméne Kerberos/GSSAPI realm.
+# LOCALIZATION NOTE (imapAuthMechNotSupported): %S is the server hostname
+imapAuthMechNotSupported=Server IMAP %S nepodporuje zvolenú metódu overenia. Zmeňte nastavenie 'Metóda overenia' v okne 'Nastavenia účtov | Nastavenie servera'.
 
-## @name IMAP_LOGIN_DISABLED
-## @loc None
-# LOCALIZATION NOTE (5116): %S is the account name
-5116=Nie je možné prihlásiť sa k účtu %S, pretože server neumožňuje overenie bez použitia STARTTLS alebo SSL/TLS. Skúste v nastaveniach účtu povoliť zabezpečené sieťové pripojenie alebo bezpečné overenie.
+# LOCALIZATION NOTE (imapAuthGssapiFailed): %S is the server hostname
+imapAuthGssapiFailed=Všetky možnosti pripojenia sa k serveru %S zlyhali. Skontrolujte zadané heslo alebo zmeňte nastavenie 'Metóda overenia' v okne 'Nastavenia účtov | Nastavenie servera'.
 
-## @name IMAP_SERVER_COMMAND_FAILED
-## @loc None
-# LOCALIZATION NOTE (5117):
+# LOCALIZATION NOTE (imapServerCommandFailed):
 # Place the word %1$S in your translation where the name of the account name should appear.
 # Place the word %2$S in your translation where the server response should appear.
-5117=Aktuálne vykonávaný príkaz zlyhal. Poštový server pre účet %1$S odpovedal: %2$S
+imapServerCommandFailed=Aktuálne vykonávaný príkaz zlyhal. Poštový server pre účet %1$S odpovedal: %2$S
 
-## @name IMAP_FOLDER_COMMAND_FAILED
-## @loc None
-# LOCALIZATION NOTE (5118): Do not translate the word %S below.
+# LOCALIZATION NOTE (imapFolderCommandFailed): Do not translate the word %S below.
 # Place the word %1$S in your translation where the name of the account should appear.
 # Place the word %2$S in your translation where the name of the folder should appear.
 # Place the word %3$S in your translation where the server response should appear.
-5118=Práve vykonávaná operácia na priečinku '%2$S' zlyhala. Poštový server pre účet %1$S odpovedal: %3$S
+imapFolderCommandFailed=Práve vykonávaná operácia na priečinku '%2$S' zlyhala. Poštový server pre účet %1$S odpovedal: %3$S
 
-## @name IMAP_SERVER_ALERT
-## @loc None
-# LOCALIZATION NOTE (5119):
+# LOCALIZATION NOTE (imapServerAlert):
 # Place the word %1$S in your translation where the name of the account should appear.
 # Place the word %2$S in your translation where the alert from the server should appear.
-5119=Upozornenie z účtu %1$S: %2$S
+imapServerAlert=Upozornenie z účtu %1$S: %2$S
--- a/mail/chrome/messenger/localMsgs.properties
+++ b/mail/chrome/messenger/localMsgs.properties
@@ -1,16 +1,20 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 #
 # The following are used by the local mail code to display progress/status/error messages
 #
 
+# LOCALIZATION NOTE(pop3ErrorDialogTitle): Do not translate the word "%S"
+# below. Place the word %S where the account name should appear.
+pop3ErrorDialogTitle=Chyba na účte %S
+    
 pop3EnterPasswordPromptTitle=Zadajte svoje heslo
 
 # LOCALIZATION NOTE(pop3EnterPasswordPrompt): Do not translate the words "%1$S"
 # and "%2$S" below. Place the word %1$S where the user name should appear, and
 # %2$S where the host name should appear.
 pop3EnterPasswordPrompt=Zadajte heslo pre %1$S na %2$S:
 
 # LOCALIZATION NOTE(pop3PreviouslyEnteredPasswordIsInvalidPrompt): Do not
@@ -55,17 +59,19 @@ localStatusDocumentDone=Hotovo
 # Status - pop3 server error
 #LOCALIZATION NOTE (pop3ServerError): Do not translate POP3 in the following line.
 pop3ServerError=Nastala chyba servera POP3.
 
 # Status - pop3 user name failed
 pop3UsernameFailure=Nastala chyba počas posielania používateľského mena na server.
 
 # Status - password failed
-pop3PasswordFailure=Nastala chyba počas posielania hesla na server.
+#LOCALIZATION NOTE (pop3PasswordFailed): Do not translate "%1$S" below.
+# Place the word %1$S where the user name should appear.
+pop3PasswordFailed=Odoslanie hesla pre používateľa %1$S zlyhalo.
 
 # Status - write error occurred
 pop3MessageWriteError=Nastala chyba počas ukladania správy. Uistite sa, že máte právo zapisovať do súborového systému a na zápis správy je dostatok miesta.
 
 # Status - retr failure from the server
 pop3RetrFailure=Vykonanie príkazu RETR bolo neúspešné. Chyba pri prijímaní správy.
 
 # Status - password undefined
--- a/mail/chrome/messenger/messenger.dtd
+++ b/mail/chrome/messenger/messenger.dtd
@@ -194,17 +194,17 @@
 <!ENTITY sortByOrderReceivedCmd.accesskey "P">
 <!ENTITY sortAscending.label "Vzostupne">
 <!ENTITY sortAscending.accesskey "o">
 <!ENTITY sortDescending.label "Zostupne">
 <!ENTITY sortDescending.accesskey "s">
 <!ENTITY sortThreaded.label "Zreťazené usporiadanie">
 <!ENTITY sortThreaded.accesskey "Z">
 <!ENTITY sortUnthreaded.label "Klasické usporiadanie">
-<!ENTITY sortUnthreaded.accesskey "K">
+<!ENTITY sortUnthreaded.accesskey "d">
 <!ENTITY groupBySort.label "Triedením zoskupiť">
 <!ENTITY groupBySort.accesskey "T">
 <!ENTITY msgsMenu.label "Správy">
 <!ENTITY msgsMenu.accesskey "S">
 <!ENTITY threads.label "Vlákna">
 <!ENTITY threads.accesskey "V">
 <!ENTITY allMsgsCmd.label "Všetky">
 <!ENTITY allMsgsCmd.accesskey "V">
@@ -488,17 +488,17 @@
 <!ENTITY accountManagerCmd.accesskey "N">
 <!-- LOCALIZATION NOTE (accountManagerCmdUnix.accesskey): belongs to accountManagerCmd.label,
         which is placed under the Edit menu on Unix systems -->
 <!ENTITY accountManagerCmdUnix.accesskey "A">
 <!ENTITY allowRemoteDebugging.label "Povoliť vzdialené ladenie">
 <!ENTITY allowRemoteDebugging.accesskey "P">
 
 <!-- Mail Toolbar -->
-<!ENTITY getMsgButton.label "Prijať">
+<!ENTITY getMsgButton1.label "Prijať správy">
 <!ENTITY newMsgButton.label "Nová">
 <!ENTITY replyButton.label "Odpoveď">
 <!ENTITY replyAllButton.label "Odpoveď Vš.">
 <!ENTITY replyListButton.label "Odpovedať zoznamu">
 <!ENTITY forwardButton.label "Odoslať ďalej">
 <!ENTITY fileButton.label "Uložiť">
 <!ENTITY archiveButton.label "Archivovať">
 <!ENTITY nextButton.label "Ďalšia">
--- a/mail/chrome/messenger/messenger.properties
+++ b/mail/chrome/messenger/messenger.properties
@@ -400,16 +400,22 @@ passwordPrompt=Zadajte vaše heslo pre %1$S na %2$S:
 passwordTitle=Vyžaduje sa heslo na poštový server
 
 # for checking if the user really wants to open lots of messages in separate windows.
 openWindowWarningTitle=Potvrdenie
 # LOCALIZATION NOTE (openWindowWarningConfirmation): Semi-colon list of plural forms.
 # #1 is the number of messages the user is attempting to open.
 openWindowWarningConfirmation=Otvorenie #1 správy môže trvať dlho. Pokračovať?;Otvorenie #1 správ môže trvať dlho. Pokračovať?;Otvorenie #1 správ môže trvať dlho. Pokračovať?
 
+# for checking if the user really wants to open lots of messages in tabs.
+openTabWarningTitle=Potvrdenie
+# LOCALIZATION NOTE (openTabWarningConfirmation): Semi-colon list of plural forms.
+# #1 is the number of messages the user is attempting to open.
+openTabWarningConfirmation=Otvorenie #1 správy môže trvať dlho. Pokračovať?;Otvorenie #1 správ môže trvať dlho. Pokračovať?;Otvorenie #1 správ môže trvať dlho. Pokračovať?
+
 # for warning the user that a tag they're trying to create already exists
 tagExists=Popis s týmto názvom už existuje.
 
 # title of the edit tag dialog
 editTagTitle=Upraviť popis
 
 # for the virtual folder list dialog title
 # %S is the name of the saved search folder
--- a/mobile/android/base/android_strings.dtd
+++ b/mobile/android/base/android_strings.dtd
@@ -1,15 +1,12 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<!ENTITY  splash_settingup "Prebieha nastavenie prehliadača &brandShortName;">
-<!ENTITY  splash_bookmarks_history "Prebieha aktualizácia vašich záložiek a histórie prehliadania. Proces môže trvať niekoľko minút.">
-
 <!ENTITY  no_space_to_start_error "Na spustenie prehliadača &brandShortName; nie je dostatok miesta.">
 <!ENTITY  error_loading_file "Pri načítavaní súborov potrebných na spustenie prehliadača &brandShortName; sa vyskytla chyba.">
 
 <!ENTITY  awesomebar_all_pages_title "Top stránky">
 <!ENTITY  awesomebar_bookmarks_title "Záložky">
 <!ENTITY  awesomebar_history_title "História">
 <!ENTITY  awesomebar_switch_to_tab "Prejsť na kartu">
 
@@ -61,30 +58,36 @@
 <!ENTITY one_tab "1 karta">
 <!-- Localization note (num_tabs2) : Number of tabs is always more than one.
      We can't use android plural forms, sadly. See bug #753859. -->
 <!ENTITY num_tabs2 "Počet kariet: &formatD;">
 <!ENTITY new_tab_opened "Nová karta otvorená">
 
 <!ENTITY settings "Nastavenia">
 <!ENTITY settings_title "Nastavenia">
-<!ENTITY pref_category_general "Všeobecné">
-<!ENTITY pref_category_privacy "Súkromie a bezpečnosť">
-<!ENTITY pref_category_content "Obsah">
-<!-- Localization note (datareporting_title) : This string matches
-     (dataChoicesTab.label) in chrome/browser/preferences/advanced.dtd except in
-     capitalization. -->
+<!ENTITY pref_category_advanced "Rozšírené">
+<!ENTITY pref_category_customize "Prispôsobenie">
+<!ENTITY pref_category_search2 "Nastavenia vyhľadávania">
+<!ENTITY pref_category_display "Zobrazovanie">
+<!ENTITY pref_category_privacy_short "Súkromie">
+<!ENTITY pref_category_vendor "&vendorShortName;">
 <!ENTITY pref_category_datareporting "Odosielanie údajov">
-<!ENTITY pref_about_firefox "O prehliadači &brandShortName;">
+<!ENTITY pref_category_devtools "Vývojárske nástroje">
+<!ENTITY pref_developer_remotedebugging "Vzdialené ladenie">
+<!ENTITY pref_developer_remotedebugging_docs "Ďalšie informácie">
+<!ENTITY pref_category_installed_search_engines "Nainštalované vyhľadávacie moduly">
 <!ENTITY pref_remember_signons "Pamätať si heslá">
 
 <!-- Localization note: These are shown in the left sidebar on tablets -->
-<!ENTITY pref_header_general "Všeobecné">
-<!ENTITY pref_header_privacy "Súkromie a bezpečnosť">
-<!ENTITY pref_header_content "Obsah">
+<!ENTITY pref_header_customize "Prispôsobenie">
+<!ENTITY pref_header_display "Zobrazovanie">
+<!ENTITY pref_header_privacy_short "Súkromie">
+<!ENTITY pref_header_help "Pomocník">
+<!ENTITY pref_header_vendor "&vendorShortName;">
+<!ENTITY pref_header_devtools "Vývojárske nástroje">
 
 <!ENTITY pref_cookies_menu "Súbory cookies">
 <!ENTITY pref_cookies_accept_all "Povolené">
 <!ENTITY pref_cookies_not_accept_foreign "Povolené, okrem cookies tretích strán">
 <!ENTITY pref_cookies_disabled "Zakázané">
 
 <!ENTITY pref_donottrack_menu "Sledovanie">
 <!ENTITY pref_donottrack_disallow_tracking "Požiadať stránky, aby nesledovali moju aktivitu">
@@ -95,17 +98,21 @@
 <!ENTITY pref_char_encoding_on "Zobrazovať ponuku">
 <!ENTITY pref_char_encoding_off "Nezobrazovať ponuku">
 <!ENTITY pref_clear_private_data "Vymazať súkromné údaje">
 <!ENTITY pref_plugins "Zásuvné moduly">
 <!ENTITY pref_plugins_enabled "Povolené">
 <!ENTITY pref_plugins_tap_to_play "Prehrávať po ťuknutí">
 <!ENTITY pref_plugins_disabled "Zakázané">
 <!ENTITY pref_text_size "Veľkosť textu">
-<!ENTITY pref_reflow_on_zoom3 "Zaostriť text po dvojitom ťuknutí">
+<!ENTITY pref_reflow_on_zoom4 "Zaostriť text">
+<!ENTITY pref_restore "Karty">
+<!ENTITY pref_restore_always "Vždy karty">
+<!ENTITY pref_restore_crash "Obnoviť po zlyhaní">
+<!ENTITY pref_restore_never "Nikdy neobnoviť">
 <!ENTITY pref_font_size_tiny "Maličké">
 <!ENTITY pref_font_size_small "Malé">
 <!ENTITY pref_font_size_medium "Stredné">
 <!ENTITY pref_font_size_large "Veľké">
 <!ENTITY pref_font_size_xlarge "Veľmi veľké">
 <!ENTITY pref_use_master_password "Používať hlavné heslo">
 <!ENTITY pref_font_size_set "Nastaviť">
 
@@ -128,16 +135,20 @@ size. -->
 <!ENTITY pref_private_data_formdata "História vyhľadávania a formulárov">
 <!ENTITY pref_private_data_cookies2 "Cookies a aktívne prihlásenia">
 <!ENTITY pref_private_data_passwords "Uložené heslá">
 <!ENTITY pref_private_data_cache "Vyrovnávacia pamäť">
 <!ENTITY pref_private_data_offlineApps "Údaje stránok v režime offline">
 <!ENTITY pref_private_data_siteSettings2 "Nastavenia stránok">
 <!ENTITY pref_private_data_downloadFiles "Prevzaté súbory">
 
+<!ENTITY pref_about_firefox "Čo je &brandShortName;">
+<!ENTITY pref_vendor_faqs "Často kladené otázky">
+<!ENTITY pref_vendor_feedback "Odoslať názor">
+
 <!-- Localization note (datareporting_fhr_title, datareporting_fhr_summary2,
      reporting_telemetry_title, datareporting_telemetry_summary,
      datareporting_crashreporter_summary) : These match the strings in
      en-US/chrome/browser/preferences/advanced.dtd (healthReportSection.label,
      healthReportDesc.label, telemetrySection.label, telemetryDesc.label,
      crashReporterDesc.label). -->
 <!ENTITY datareporting_fhr_title "Správa o kondícii prehliadača &brandShortName;">
 <!ENTITY datareporting_fhr_summary2 "Zdieľa so spoločnosťou &vendorShortName; údaje o kondícii prehliadača a zároveň Vám pomáha porozumieť jeho výkonnosti.">
@@ -178,19 +189,18 @@ size. -->
 <!ENTITY desktop_mode "Plná verzia stránky">
 <!ENTITY tools "Nástroje">
 <!ENTITY new_tab "Nová karta">
 <!ENTITY new_private_tab "Nová súkromná karta">
 <!ENTITY close_all_tabs "Zavrieť všetky karty">
 <!ENTITY tabs_normal "Karty">
 <!ENTITY tabs_private "Súkromné">
 <!ENTITY tabs_synced "Synchronizované">
-<!ENTITY wallpaper_success "Tapeta aktualizovaná">
-<!ENTITY wallpaper_progress "Nastavuje sa tapeta">
-<!ENTITY wallpaper_fail "Tapetu nebolo možné nastaviť">
+<!ENTITY set_image_fail "Nie je možné nastaviť obrázok">
+<!ENTITY set_image_chooser_title "Nastaviť obrázok ako">
 
 <!-- Localization note (find_text, find_prev, find_next, find_close) : These strings are used
      as alternate text for accessibility. They are not visible in the UI. -->
 <!ENTITY find_text "Hľadať na stránke">
 <!ENTITY find_prev "Predchádzajúci">
 <!ENTITY find_next "Ďalší">
 <!ENTITY find_close "Zavrieť">
 
@@ -226,17 +236,20 @@ size. -->
 <!ENTITY site_settings_clear        "Vymazať">
 <!ENTITY site_settings_no_settings  "Nie sú uložené žiadne údaje.">
 
 <!ENTITY reading_list "Zoznam na prečítanie">
 <!ENTITY reading_list_added "Stránka pridaná do Zoznamu na prečítanie">
 <!ENTITY reading_list_removed "Stránka bola odstránená zo Zoznamu na prečítanie">
 <!ENTITY reading_list_failed "Pridanie stránky do Zoznamu na prečítanie sa nepodarilo">
 <!ENTITY reading_list_duplicate "Stránka sa už nachádza v Zozname na prečítanie">
-<!ENTITY reader "Čítačka">
+
+<!-- Localization note : These strings are used as alternate text for accessibility.
+     They are not visible in the UI. -->
+<!ENTITY page_action_dropmarker_description "Ďalšie akcie">
 
 <!ENTITY masterpassword_create_title "Vytvoriť hlavné heslo">
 <!ENTITY masterpassword_remove_title "Odstrániť hlavné heslo">
 <!ENTITY masterpassword_password "Heslo">
 <!ENTITY masterpassword_confirm "Potvrdenie hesla">
 
 <!ENTITY button_ok "OK">
 <!ENTITY button_cancel "Zrušiť">
@@ -310,19 +323,32 @@ just addresses the organization to follo
 <!-- Localization note (suggestions_prompt2): The placeholder &formatS; will be
      replaced with the name of the search engine. -->
 <!ENTITY suggestions_prompt2 "Chcete zapnúť zobrazovanie návrhov vyhľadávania v module &formatS;?">
 
 <!ENTITY webapp_generic_name "Aplikácia">
 
 <!ENTITY searchable_description "Záložky a história">
 
+<!ENTITY devtools_remote_debugging_forward "Nezabudnite nastaviť presmerovanie portov!">
+
 <!-- Updater notifications -->
 <!ENTITY updater_start_title2 "Je dostupná aktualizácia pre &brandShortName;">
 <!ENTITY updater_start_select2 "Ťuknutím sem ju prevezmete">
 
 <!ENTITY updater_downloading_title2 "Preberá sa &brandShortName;">
 <!ENTITY updater_downloading_title_failed2 "Prevzatie zlyhalo">
 <!ENTITY updater_downloading_select2 "Ťuknutím sem aktualizáciu po prevzatí nainštalujete">
 <!ENTITY updater_downloading_retry2 "Ťuknutím sem to skúste znova">
 
 <!ENTITY updater_apply_title2 "Je dostupná aktualizácia pre &brandShortName;">
 <!ENTITY updater_apply_select2 "Ťuknutím sem ju použijete">
+
+<!-- Guest mode -->
+<!ENTITY new_guest_session "Zapnúť režim Hosť">
+<!ENTITY exit_guest_session "Opustiť režim Hosť">
+<!ENTITY guest_session_dialog_continue "Pokračovať">
+<!ENTITY guest_session_dialog_cancel "Zrušiť">
+<!ENTITY new_guest_session_title "&brandShortName; bude teraz reštartovaný">
+<!ENTITY new_guest_session_text "Počas prehliadania v tomto režime nebude mať osoba používajúca zariadenie prístup k akýmkoľvek osobným údajom (ako uložené heslá, história alebo záložky).\n\nPo opustení režimu Hosť budú údaje získané v tomto režime odstránené a bude obnovená vaša posledná relácia.">
+
+<!ENTITY exit_guest_session_title "&brandShortName; bude teraz reštartovaný">
+<!ENTITY exit_guest_session_text "Údaje pochádzajúce z tejto relácie prehliadania budú odstránené.">
--- a/mobile/android/chrome/aboutAddons.properties
+++ b/mobile/android/chrome/aboutAddons.properties
@@ -5,8 +5,10 @@
 addonsSearchEngine.description=Integrované vyhľadávanie
 
 addonType.extension=Rozšírenie
 addonType.theme=Téma vzhľadu
 addonType.locale=Jazyk
 addonType.search=Vyhľadávanie
 
 addonStatus.uninstalled=%S bude odinštalovaný po reštarte.
+
+addons.browseAll=Prehľadávať doplnky pre Firefox
--- a/mobile/android/chrome/aboutDownloads.properties
+++ b/mobile/android/chrome/aboutDownloads.properties
@@ -1,14 +1,14 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 # LOCALIZATION NOTE (downloadMessage.deleteAll):
-# Semi-colon list of plural forms. See:
+# Semicolon-separated list of plural forms. See:
 # http://developer.mozilla.org/en/docs/Localization_and_Plurals
 downloadMessage.deleteAll=Odstrániť tento záznam?;Odstrániť tieto #1 záznamy?;Odstrániť všetkých #1 záznamov?
 
 downloadAction.deleteAll=Odstrániť všetko
 
 downloadState.downloading=Preberá sa…
 downloadState.canceled=Zrušené
 downloadState.failed=Zlyhalo
--- a/mobile/android/chrome/aboutFeedback.dtd
+++ b/mobile/android/chrome/aboutFeedback.dtd
@@ -7,36 +7,37 @@
      your language and/or locale. More detailed notes below. -->
 
 <!ENTITY pageTitle                 "Spätná väzba pre &brandShortName;">
 
 <!ENTITY intro.header              "Máte minútku?">
 <!ENTITY intro.message             "Ako sa Vám páči nový &brandShortName; pre Android?">
 <!ENTITY intro.happyLink           "Je super">
 <!ENTITY intro.sadLink             "Vyskytli sa nejaké problémy">
+<!ENTITY intro.maybeLater          "Možno neskôr">
 
 <!-- LOCALIZATION NOTE (support.pre): Include a trailing space as needed. -->
 <!-- LOCALIZATION NOTE (support.link): Avoid leading/trailing spaces, this text is a link. -->
 <!-- LOCALIZATION NOTE (support.post): Include a starting space as needed. -->
-<!ENTITY support.pre               "Ak potrebujete pomoc alebo máte s používaním &brandShortName;u problém, navštívte stránky ">
+<!ENTITY support.pre2              "Ďalšie informácie nájdete na stránkach ">
 <!ENTITY support.link              "podpory &brandShortName;u">
-<!ENTITY support.post              ".">
+<!ENTITY support.post2             ".">
 
 <!ENTITY happy.header              "To radi počujeme.">
 
 <!-- LOCALIZATION NOTE (happy.message): "share the love" — This feels purposely exaggerated in English,
      but essentially it means that we want you to let others know how much you love Firefox. -->
 <!ENTITY happy.message             "Chcete to vyjadriť aj tým, že nás ohodnotíte 5 hviezdami na Google Play?">
 
 <!-- LOCALIZATION NOTE (happy.finePrint): "feels great" — Another exaggeration where we're trying to
      get people to rate us by playfully telling them there's a benefit in it for them as well. -->
 <!ENTITY happy.finePrint           "Zaberie to len minútku a ten pocit je úžasný.">
 
 <!ENTITY happy.ratingLink          "Áno, prejsť na Google Play">
-<!ENTITY happy.maybeLater          "Možno neskôr">
+<!ENTITY happy.maybeLater2         "Možno neskôr">
 <!ENTITY happy.noThanks            "Nie, ďakujem">
 
 <!ENTITY sad.message               "Je nám ľúto, že ste mali s &brandShortName;om problémy. Prosím, povedzte nám čo sa stalo a my sa pokúsime to napraviť.">
 <!ENTITY sad.placeholder           "Sem zadajte váš komentár">
 <!ENTITY sad.lastSite              "Naposledy navštívená stránka (voliteľné)">
 
 <!-- LOCALIZATION NOTE (sad.urlPlaceholder): Placeholder text that appears in "Last visited site" input box when there is no text. -->
 <!ENTITY sad.urlPlaceholder        "http://">
--- a/mobile/android/chrome/browser.properties
+++ b/mobile/android/chrome/browser.properties
@@ -90,18 +90,26 @@ desktopNotification.dontAllow=Nepovoliť
 desktopNotification.ask=Povoliť %S používať notifikácie?
 # LOCALIZATION NOTE (desktopNotification.useNotifications): Label that will be
 # used in site settings dialog.
 desktopNotification.useNotifications=Používanie notifikácií
 # LOCALIZATION NOTE (desktopNotification.dontAskAgain): This label appears next to a
 # checkbox to indicate whether or not the user wants to make a permanent decision.
 desktopNotification.dontAskAgain=Nabudúce sa pre túto stránku nepýtať
 
+# Contacts API
+contacts.allow=Povoliť
+contacts.dontAllow=Nepovoliť
+contacts.ask=Povoliť %S pristupovať k vašim kontaktom?
+# LOCALIZATION NOTE (contacts.dontAskAgain): This label appears next to a
+# checkbox to indicate whether or not the user wants to make a permanent decision.
+contacts.dontAskAgain=Nabudúce sa pre túto stránku nepýtať
+
 # New Tab Popup
-# LOCALIZATION NOTE (newtabpopup, newprivatetabpopup): Semi-colon list of plural forms.
+# LOCALIZATION NOTE (newtabpopup, newprivatetabpopup): Semicolon-separated list of plural forms.
 # See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # #1 number of tabs
 newtabpopup.opened=Bola otvorená #1 nová karta;Boli otvorené #1 nové karty;Bolo otvorených #1 nových kariet
 newprivatetabpopup.opened=Bola otvorená #1 nová súkromná karta;Boli otvorené #1 nové súkromné karty;Bolo otvorených #1 nových súkromných kariet
 
 # Offline web applications
 offlineApps.ask=Povoliť stránke %S uložiť údaje na použitie v režime offline?
 offlineApps.dontAskAgain=Nabudúce sa pre túto stránku nepýtať
@@ -151,23 +159,29 @@ contextmenu.bookmarkLink=Pridať odkaz medzi záložky
 contextmenu.copyEmailAddress=Kopírovať e-mailovú adresu
 contextmenu.shareEmailAddress=Zdieľať e-mailovú adresu
 contextmenu.copyPhoneNumber=Kopírovať telefónne číslo
 contextmenu.sharePhoneNumber=Zdieľať telefónne číslo
 contextmenu.changeInputMethod=Zvoľte metódu vstupu
 contextmenu.fullScreen=Na celú obrazovku
 contextmenu.copyImageLocation=Kopírovať adresu obrázka
 contextmenu.shareImage=Zdieľať obrázok
+# LOCALIZATION NOTE (contextmenu.search):
+# The label of the contextmenu item which allows you to search with your default search engine for
+# the text you have selected. %S is the name of the search engine. For example, "Google".
+contextmenu.search=Vyhľadať pomocou %S
 contextmenu.saveImage=Uložiť obrázok
-contextmenu.setWallpaper=Nastaviť ako tapetu
+contextmenu.setImageAs=Nastaviť obrázok ako
 contextmenu.addSearchEngine=Pridať vyhľadávací modul
 contextmenu.playMedia=Prehrať
 contextmenu.pauseMedia=Pozastaviť
 contextmenu.shareMedia=Zdieľať video
 contextmenu.showControls2=Zobraziť ovládanie
+contextmenu.mute=Stlmiť
+contextmenu.unmute=Zrušiť stlmenie
 contextmenu.saveVideo=Uložiť video
 contextmenu.saveAudio=Uložiť zvuk
 contextmenu.addToContacts=Pridať medzi kontakty
 
 contextmenu.copy=Kopírovať
 contextmenu.copyAll=Kopírovať všetko
 contextmenu.selectWord=Vybrať slovo
 contextmenu.selectAll=Vybrať všetko
@@ -229,16 +243,18 @@ masterPassword.incorrect=Nesprávne heslo
 # Debugger
 # LOCALIZATION NOTE (remoteIncomingPromptTitle): The title displayed on the
 # dialog that prompts the user to allow the incoming connection.
 remoteIncomingPromptTitle=Prichádzajúce spojenie
 # LOCALIZATION NOTE (remoteIncomingPromptMessage): The message displayed on the
 # dialog that prompts the user to allow the incoming connection.
 remoteIncomingPromptMessage=Objavila sa požiadavka na povolenie vzdialeného ladenia. Vzdialený klient môže kompletne prevziať kontrolu nad vašim prehliadačom. Povoliť pripojenie?
 remoteIncomingPromptDisable=Zakázať
+remoteIncomingPromptAccept=OK
+remoteIncomingPromptCancel=Zrušiť
 
 # Helper apps
 helperapps.open=Otvoriť
 helperapps.ignore=Ignorovať
 helperapps.dontAskAgain=Pre túto stránku sa už nepýtať
 helperapps.openWithApp2=Otvoriť pomocou aplikácie %S
 helperapps.openWithList2=Otvoriť pomocou aplikácie
 helperapps.always=Vždy
@@ -262,8 +278,12 @@ getUserMedia.videoDevice.back = Zadná
 getUserMedia.videoDevice.none = Žiadne video
 getUserMedia.videoDevice.prompt = Použiť túto kameru
 getUserMedia.audioDevice.default = Mikrofón %S
 getUserMedia.audioDevice.none = Žiadny zvuk
 getUserMedia.audioDevice.prompt = Použiť tento mikrofón
 getUserMedia.sharingCamera.message2 = Kamera je zapnutá
 getUserMedia.sharingMicrophone.message2 = Mikrofón je zapnutý
 getUserMedia.sharingCameraAndMicrophone.message2 = Kamera a mikrofón sú zapnuté
+
+#Reader mode
+readerMode.enter = Zapnúť režim Na čítanie
+readerMode.exit = Ukončiť režim Na čítanie
--- a/suite/chrome/browser/region.properties
+++ b/suite/chrome/browser/region.properties
@@ -7,16 +7,17 @@
 # all.js
 #
 browser.startup.homepage=http://www.seamonkey-project.org/start/
 browser.throbber.url=http://www.seamonkey-project.org/
 browser.search.defaulturl=http://www.google.com/search?q=
 
 browser.translation.service=http://translate.google.com/translate?prev=/language_tools&u=
 browser.translation.serviceDomain=translate.google.com
+browser.validate.html.service=http://validator.w3.org/check?charset=%28detect+automatically%29&doctype=Inline&uri=
 
 #config.js
 #
 startup.homepage_override_url=http://www.seamonkey-project.org/releases/seamonkey%VERSION%/
 
 # This is the default set of web based feed handlers shown in the reader
 # selection UI
 browser.contentHandlers.types.0.title=Google
new file mode 100644
--- /dev/null
+++ b/suite/chrome/browser/webDeveloper.dtd
@@ -0,0 +1,6 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!ENTITY validatePage.label            "Overiť kód tejto stránky">
+<!ENTITY validatePage.accesskey        "t">
--- a/suite/chrome/common/contentAreaCommands.dtd
+++ b/suite/chrome/common/contentAreaCommands.dtd
@@ -99,16 +99,29 @@
 <!ENTITY mediaPlay.label              "Prehrať">
 <!ENTITY mediaPlay.accesskey          "P">
 <!ENTITY mediaPause.label             "Pozastaviť">
 <!ENTITY mediaPause.accesskey         "P">
 <!ENTITY mediaMute.label              "Stlmiť">
 <!ENTITY mediaMute.accesskey          "m">
 <!ENTITY mediaUnmute.label            "Zrušiť stlmenie">
 <!ENTITY mediaUnmute.accesskey        "m">
+<!ENTITY mediaPlaybackRate.label        "Rýchlosť prehrávania">
+<!ENTITY mediaPlaybackRate.accesskey    "R">
+<!ENTITY mediaPlaybackRate050.label     "Spomalene (0.5×)">
+<!ENTITY mediaPlaybackRate050.accesskey "S">
+<!ENTITY mediaPlaybackRate100.label     "Normálna rýchlosť">
+<!ENTITY mediaPlaybackRate100.accesskey "N">
+<!ENTITY mediaPlaybackRate150.label     "Zrýchlene (1.5×)">
+<!ENTITY mediaPlaybackRate150.accesskey "Z">
+<!ENTITY mediaPlaybackRate200.label     "Vysoká rýchlosť (2×)">
+<!ENTITY mediaPlaybackRate200.accesskey "V">
+<!-- LOCALIZATION NOTE: The access keys for "Show Controls" and
+"Hide Controls" are the same because the two context-menu
+items are mutually exclusive. -->
 <!ENTITY mediaShowControls.label      "Zobraziť ovládače">
 <!ENTITY mediaShowControls.accesskey  "d">
 <!ENTITY mediaHideControls.label      "Skryť ovládače">
 <!ENTITY mediaHideControls.accesskey  "d">
 <!ENTITY videoFullScreen.label        "Na celú obrazovku">
 <!ENTITY videoFullScreen.accesskey    "c">
 <!ENTITY videoSaveImage.label         "Uložiť snímku ako…">
 <!ENTITY videoSaveImage.accesskey     "s">
--- a/suite/chrome/common/help/mailnews_organizing.xhtml
+++ b/suite/chrome/common/help/mailnews_organizing.xhtml
@@ -642,21 +642,31 @@
 
 <ol>
   <li>Open the Tools menu and choose Search Messages. You see the Search
     Messages dialog box.</li>
   <li>Next to <q>Search for messages in</q>, choose the account, newsgroup, or
     folder through which you want to search.</li>
   <li>Select <q>Search subfolders</q> to include all subfolders in the
     search.</li>
-  <li>Select <q>Search local system</q> to search only messages from newsgroups
-    or IMAP accounts that have been saved locally.
-
-    <p><strong>Note</strong>: The checkbox will be disabled if it&apos;s not
-      possible to search remotely stored messages.</p>
+  <li>Next to <q>Perform search operations on</q>, select an option where to
+    search for messages in newsgroups or IMAP accounts:
+    <ul>
+      <li>Choose <q>Local system</q> to use only the information stored locally
+        for the search without any network activity. This mode includes all
+        major message headers. You can&apos;t search the message body locally
+        unless the account and its folders have been set up for
+        <a href="mailnews_account_settings.xhtml#synchronization_and_storage">synchronization</a>.
+      </li>
+      <li>Choose <q>Remote server</q> to perform all searches on the server
+        where the messages are located. This will allow you to also search for
+        contents in message bodies which have not been synchronized.</li>
+    </ul>
+    <p><strong>Note</strong>: This menu will be disabled if it&apos;s not
+      possible to search remotely on the server (e.g., for POP accounts).</p>
   </li>
   <li>Select which matching option Mail &amp; Newsgroups will use to search for
     messages that match all or at least one of the conditions (criteria) that
     you choose.</li>
   <li>Use the drop-down lists to indicate the search criteria (for example,
     <q>Subject</q> and <q>contains</q>) and then type the text or phrase that
     you want to match.
 
--- a/suite/chrome/common/pref/pref-certs.dtd
+++ b/suite/chrome/common/pref/pref-certs.dtd
@@ -10,8 +10,14 @@
 <!ENTITY managedevices.text       "Použite toto tlačidlo na správu svojich bezpečnostných zariadení, napríklad Smart Cards.">
 <!ENTITY managedevices.button     "Správa bezpečnostných zariadení…">
 <!ENTITY managedevices.accesskey  "b">
 
 <!ENTITY ssl.label                "SSL">
 
 <!ENTITY pref.certs.title         "Certifikáty">
 <!ENTITY certs.label              "Certifikáty">
+
+<!ENTITY validation.ocsp.caption              "Online overenie stavu certifikátov">
+<!ENTITY enableOCSP.label                     "Použiť Online overenie stavu certifikátov (OCSP) na potvrdenie platnosti certifikátov">
+<!ENTITY enableOCSP.accesskey                 "u">
+<!ENTITY validation.requireOCSP.description   "Ak pripojenie k serveru OCSP zlyhá, označiť certifikát ako neplatný">
+<!ENTITY validation.requireOCSP.accesskey     "A">
deleted file mode 100644
--- a/suite/chrome/common/pref/pref-validation.dtd
+++ /dev/null
@@ -1,16 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<!ENTITY pref.validation.title                "Overovanie platnosti">
-
-<!ENTITY validation.crl.caption               "Zoznam uložených certifikátov (CLR)">
-<!ENTITY validation.crl.description           "Na správu CRL (Certificate revocation list) uložených v databáze certifikátov použite Správcu zoznamu zrušených certifikátov (CRL).">
-<!ENTITY validation.managecrls.button         "Správa CRL…">
-<!ENTITY validation.managecrls.accesskey      "S">
-
-<!ENTITY validation.ocsp.caption              "Online overenie stavu certifikátov">
-<!ENTITY enableOCSP.label                     "Použiť Online overenie stavu certifikátov (OCSP) na potvrdenie platnosti certifikátov">
-<!ENTITY enableOCSP.accesskey                 "u">
-<!ENTITY validation.requireOCSP.description   "Ak pripojenie k serveru OCSP zlyhá, označiť certifikát ako neplatný">
-<!ENTITY validation.requireOCSP.accesskey     "A">
--- a/suite/chrome/common/pref/preferences.dtd
+++ b/suite/chrome/common/pref/preferences.dtd
@@ -23,17 +23,16 @@
 <!ENTITY privatedata.label "Súkromné údaje">
 <!ENTITY cookies.label "Cookies">
 <!ENTITY images.label "Obrázky">
 <!ENTITY popups.label "Vyskakovacie okná">
 <!ENTITY passwords.label "Heslá">
 <!ENTITY masterpass.label "Hlavné heslá">
 <!ENTITY ssl.label "SSL">
 <!ENTITY certs.label "Certifikáty">
-<!ENTITY validation.label "Overovanie">
 <!ENTITY sync.label "Synchronizácia">
 <!ENTITY advance.label "Rozšírené">
 <!ENTITY down.label "Preberanie súborov">
 <!ENTITY cache.label "Vyrovnávacia pamäť">
 <!ENTITY offlineApps.label "Offline aplikácie">
 <!ENTITY proxies.label "Servery proxy">
 <!ENTITY httpnetworking.label "Spojenia HTTP">
 <!ENTITY smart.label "Inštalácia softvéru">
--- a/suite/chrome/common/utilityOverlay.dtd
+++ b/suite/chrome/common/utilityOverlay.dtd
@@ -18,17 +18,17 @@
 <!ENTITY newPageFromTemplateCmd.label "Stránka s použitím šablóny">
 <!ENTITY newPageFromTemplateCmd.accesskey "t">
 <!ENTITY newPageFromDraftCmd.label "Stránka z konceptu">
 <!ENTITY newPageFromDraftCmd.accesskey "k">
 <!ENTITY newNavigatorCmd.label "Okno prehliadača">
 <!ENTITY newNavigatorCmd.key "n">
 <!ENTITY newNavigatorCmd.accesskey "O">
 <!ENTITY newPrivateWindowCmd.label "Súkromné okno">
-<!ENTITY newPrivateWindowCmd.key "P">
+<!ENTITY newPrivateWindowCmd.key "B">
 <!ENTITY newPrivateWindowCmd.accesskey "m">
 <!ENTITY printSetupCmd.label "Nastavenie tlače…">
 <!ENTITY printSetupCmd.accesskey "a">
 <!ENTITY printPreviewCmd.label "Ukážka pred tlačou">
 <!ENTITY printPreviewCmd.accesskey "e">
 <!ENTITY printCmd.label "Tlačiť…">
 <!ENTITY printCmd.accesskey "T">
 <!ENTITY printCmd.key "P">
--- a/suite/chrome/mailnews/SearchDialog.dtd
+++ b/suite/chrome/mailnews/SearchDialog.dtd
@@ -2,18 +2,20 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!-- for SearchDialog.xul -->
 <!ENTITY searchHeading.label         "Hľadať správy v priečinku:">
 <!ENTITY searchHeading.accesskey     "s">
 <!ENTITY searchSubfolders.label      "Hľadať v podpriečinkoch">
 <!ENTITY searchSubfolders.accesskey  "d">
-<!ENTITY searchLocalSystem.label     "Hľadať v lokálnom systéme">
-<!ENTITY searchLocalSystem.accesskey "m">
+<!ENTITY searchOnHeading.label       "Vykonať operácie vyhľadávania na:">
+<!ENTITY searchOnHeading.accesskey   "e">
+<!ENTITY searchOnRemote.label        "vzdialenom serveri">
+<!ENTITY searchOnLocal.label         "lokálnom systéme">
 <!ENTITY resetButton.label           "Obnoviť">
 <!ENTITY resetButton.accesskey       "b">
 <!ENTITY openButton.label            "Otvoriť">
 <!ENTITY openButton.accesskey        "t">
 <!ENTITY deleteButton.label          "Odstrániť">
 <!ENTITY deleteButton.accesskey      "r">
 <!ENTITY searchDialogTitle.label     "Hľadanie v správach">
 <!ENTITY results.label               "Výsledky">
--- a/suite/chrome/mailnews/imapMsgs.properties
+++ b/suite/chrome/mailnews/imapMsgs.properties
@@ -2,415 +2,246 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 #
 # The following are used by the imap code to display progress/status/error messages
 #
 
 # Status - opening folder
-## @name IMAP_STATUS_SELECTING_MAILBOX
-## @loc None
-5000=Otvára sa priečinok %S…
+imapStatusSelectingMailbox=Otvára sa priečinok %S…
 
 # Status - create folder
-## @name IMAP_STATUS_CREATING_MAILBOX
-## @loc None
-5001=Vytvára sa priečinok…
+imapStatusCreatingMailbox=Vytvára sa priečinok…
 
 # Status - deleting a folder
-## @name IMAP_STATUS_DELETING_MAILBOX
-## @loc None
-# LOCALIZATION NOTE (Error 5002): The "%S" below should not be translated.
+# LOCALIZATION NOTE (imapStatusDeletingMailbox): The "%S" below should not be translated.
 # Instead, insert "%S" in your translation where you wish to display the name
 # of the folder being deleted.
-5002=Odstraňuje sa priečinok %S…
+imapStatusDeletingMailbox=Odstraňuje sa priečinok %S…
 
 # Status - renaming mailbox
-## @name IMAP_STATUS_RENAMING_MAILBOX
-## @loc None
-# LOCALIZATION NOTE (Error 5003): The "%S" below should not be translated.
+# LOCALIZATION NOTE (imapStatusRenamingMailbox): The "%S" below should not be translated.
 # Instead, insert "%S" in your translation where you wish to display the name
 # of the folder being renamed.
-5003=Premenováva sa priečinok %S…
+imapStatusRenamingMailbox=Premenováva sa priečinok %S…
 
 # Status - looking for mailboxes
-## @name IMAP_STATUS_LOOKING_FOR_MAILBOX
-## @loc None
-5004=Hľadajú sa priečinky…
+imapStatusLookingForMailbox=Hľadajú sa priečinky…
 
 # Status - subscribing to mailbox
-## @name IMAP_STATUS_SUBSCRIBE_TO_MAILBOX
-## @loc None
-# LOCALIZATION NOTE (Error 5005): The "%S" below should not be translated.
+# LOCALIZATION NOTE (imapStatusSubscribeToMailbox): The "%S" below should not be translated.
 # Instead, insert "%S" in your translation where you wish to display the name
 # of the folder being subscribed to.
-5005=Prihlasovanie sa k priečinku %S…
+imapStatusSubscribeToMailbox=Prihlasovanie sa k priečinku %S…
 
 # Status - unsubscribing from mailbox
-## @name IMAP_STATUS_UNSUBSCRIBE_MAILBOX
-## @loc None
-# LOCALIZATION NOTE (Error 5005): The "%S" below should not be translated.
+# LOCALIZATION NOTE (imapStatusUnsubscribeMailbox): The "%S" below should not be translated.
 # Instead, insert "%S" in your translation where you wish to display the name
 # of the folder being unsubscribed from.
-5006=Odhlasovanie sa z priečinku %S…
+imapStatusUnsubscribeMailbox=Odhlasovanie sa z priečinku %S…
 
 # Status - searching imap folder
-## @name IMAP_STATUS_SEARCH_MAILBOX
-## @loc None
-5007=Prehľadáva sa priečinok…
-
-# Status - getting message info
-## @name IMAP_STATUS_MSG_INFO
-## @loc None
-5008=Získavanie informácií o správe…
+imapStatusSearchMailbox=Prehľadáva sa priečinok…
 
 # Status - closing a folder
-## @name IMAP_STATUS_CLOSE_MAILBOX
-## @loc None
-5009=Zatvára sa priečinok…
+imapStatusCloseMailbox=Zatvára sa priečinok…
 
 # Status - compacting a folder
-## @name IMAP_STATUS_EXPUNGING_MAILBOX
-## @loc None
-5010=Vykonáva sa údržba priečinka…
+imapStatusExpungingMailbox=Vykonáva sa údržba priečinka…
 
 # Status - logging out
-## @name IMAP_STATUS_LOGGING_OUT
-## @loc None
-5011=Odhlasovanie…
+imapStatusLoggingOut=Odhlasovanie…
 
 # Status - checking server capabilities
-## @name IMAP_STATUS_CHECK_COMPAT
-## @loc None
-5012=Zisťovanie možností servera…
+imapStatusCheckCompat=Zisťovanie možností servera…
 
 # Status - logging on
-## @name IMAP_STATUS_SENDING_LOGIN
-## @loc None
-5013=Odosielajú sa prihlasovacie údaje…
+imapStatusSendingLogin=Odosielajú sa prihlasovacie údaje…
 
 # Status - auth logon
-## @name IMAP_STATUS_SENDING_AUTH_LOGIN
-## @loc None
-5014=Odosielajú sa prihlasovacie údaje…
+imapStatusSendingAuthLogin=Odosielajú sa prihlasovacie údaje…
+
+# Status - downloading message
+imapDownloadingMessage=Preberá sa správa…
 
-## @name IMAP_DOWNLOADING_MESSAGE
-## @loc None
-5015=Preberá sa správa…
+# Status - getting acl for folder
+# LOCALIZATION NOTE (imapGettingACLForFolder): Do not translate the word "ACL" below.
+imapGettingACLForFolder=Získavajú sa informácie o prístupových právach ACL…
 
-## @name IMAP_GETTING_ACL_FOR_FOLDER
-## @loc None
-# LOCALIZATION NOTE (Error 5029): Do not translate the word "ACL" below.
-5029=Získavajú sa informácie o prístupových právach ACL…
+# Status - getting server info
+imapGettingServerInfo=Získavajú sa informácie o nastavení servera…
 
-## @name IMAP_GETTING_SERVER_INFO
-## @loc None
-5030=Získavajú sa informácie o nastavení servera…
+# Status - getting mailbox info
+imapGettingMailboxInfo=Získavajú sa informácie o nastavení schránky…
 
-## @name IMAP_GETTING_MAILBOX_INFO
-## @loc None
-5031=Získavajú sa informácie o nastavení schránky…
+# Status - empty mime part
+imapEmptyMimePart=Táto časť tela správy bude prevzatá na požiadanie.
 
-## @name IMAP_EMPTY_MIME_PART
-## @loc None
-5032=Táto časť tela správy bude prevzatá na požiadanie.
-
-## @name IMAP_RECEIVING_MESSAGE_HEADERS_OF
-## @loc None
-# LOCALIZATION NOTE (Error 5036): Do not translate the word "%S" or "%lu" below.
-# Place the word %S in your translation where the name of the server should appear.
-# Place the word %lu where the number of headers should appear.
-5036=%S - Prijímajú sa hlavičky správ (%lu z %lu)
+# LOCALIZATION NOTE (imapReceivingMessageHeaders): Do not translate the word "%1$S", "%2$lu" or "%3$lu" below.
+# Place the word %1$S in your translation where the name of the server should appear.
+# Place the word %2$lu where the number of the header currently being downloaded should appear.
+# Place the word %3$lu where the number of headers should appear.
+imapReceivingMessageHeaders=%S - Prijímajú sa hlavičky správ (%lu z %lu)
 
-## @name IMAP_RECEIVING_MESSAGE_FLAGS_OF
-## @loc None
-# LOCALIZATION NOTE (Error 5037): Do not translate the word "%S" or "%lu" below.
-# Place the word %S in your translation where the name of the server should appear.
-# Place the word %lu where the number of flags should appear.
-5037=%S - Prijímajú sa príznaky správ (%lu z %lu)
+# LOCALIZATION NOTE (imapReceivingMessageFlags): Do not translate the word "%1$S", "%2$lu" or "%3$lu" below.
+# Place the word %1$S in your translation where the name of the server should appear.
+# Place the word %2$lu where the number of the flag currently being downloaded should appear.
+# Place the word %3$lu where the number of flags should appear.
+imapReceivingMessageFlags=%S - Prijímajú sa príznaky správ (%lu z %lu)
 
-## @name IMAP_DELETING_MESSAGES
-## @loc None
-5038=Odstraňujú sa správy…
+imapDeletingMessages=Odstraňujú sa správy…
+
+imapDeletingMessage=Odstraňuje sa správa…
 
-## @name IMAP_DELETING_MESSAGE
-## @loc None
-5039=Odstraňuje sa správa…
-
-## @name IMAP_MOVING_MESSAGES_TO
-## @loc None
-# LOCALIZATION NOTE (Error 5040): Do not translate the word "%S" below.
+# LOCALIZATION NOTE (imapMovingMessages): Do not translate the word "%S" below.
 # Place the word %S in your translation where the name of the folder should appear.
-5040=Presúvanie správ do %S…
+imapMovingMessages=Presúvanie správ do %S…
 
-## @name IMAP_MOVING_MESSAGE_TO
-## @loc None
-# LOCALIZATION NOTE (Error 5041): Do not translate the word "%S" below.
+# LOCALIZATION NOTE (imapMovingMessage): Do not translate the word "%S" below.
 # Place the word %S in your translation where the name of the folder should appear.
-5041=Presúvanie správy do %S…
+imapMovingMessage=Presúvanie správy do %S…
 
-## @name IMAP_COPYING_MESSAGES_TO
-## @loc None
-# LOCALIZATION NOTE (Error 5042): Do not translate the word "%S" below.
+# LOCALIZATION NOTE (imapCopyingMessages): Do not translate the word "%S" below.
 # Place the word %S in your translation where the name of the folder should appear.
-5042=Kopírovanie správ do %S…
+imapCopyingMessages=Kopírovanie správ do %S…
 
-## @name IMAP_COPYING_MESSAGE_TO
-## @loc None
-# LOCALIZATION NOTE (Error 5043): Do not translate the word "%S" below.
+# LOCALIZATION NOTE (imapCopyingMessage): Do not translate the word "%S" below.
 # Place the word %S in your translation where the name of the folder should appear.
-5043=Kopírovanie správy do %S…
+imapCopyingMessage=Kopírovanie správy do %S…
 
-## @name IMAP_FOLDER_RECEIVING_MESSAGE_OF
-## @loc None
-# LOCALIZATION NOTE (Error 5045): Do not translate the word "%S" or "%lu" below.
+# LOCALIZATION NOTE (imapFolderReceivingMessageOf): Do not translate the word "%S" or "%lu" below.
 # Place the word %S in your translation where the name of the folder should appear.
 # Place the word %lu where the number of headers should appear.
-5045=%S - Prijímajú sa správy (%lu z %lu)
+imapFolderReceivingMessageOf=%S - Prijímajú sa správy (%lu z %lu)
 
-## @name IMAP_DISCOVERING_MAILBOX
-## @loc None
-# LOCALIZATION NOTE (Error 5046): Do not translate the word "%S" below.
+# LOCALIZATION NOTE (imapDiscoveringMailbox): Do not translate the word "%S" below.
 # Place the word %S in your translation where the name of the folder should appear.
-5046=Nájdený priečinok: %S
+imapDiscoveringMailbox=Nájdený priečinok: %S
 
-## @name IMAP_ENTER_PASSWORD_PROMPT
-## @loc None
-# LOCALIZATION NOTE (Error 5047): Do not translate the word %S below.
+# LOCALIZATION NOTE (imapEnterPasswordPrompt): Do not translate the word %S below.
 # Place the word "%S" in your translation where the email address
 # or the username should appear
-5047=Zadajte heslo pre %S:
+imapEnterPasswordPrompt=Zadajte heslo pre %S:
 
-## @name IMAP_SERVER_NOT_IMAP4
-## @loc None
-# LOCALIZATION NOTE (Error 5048): Do not translate the word "IMAP4" below.
-5048=Server %S neposkytuje služby IMAP4.
+# LOCALIZATION NOTE (imapServerNotImap4): Do not translate the word "IMAP4" below.
+imapServerNotImap4=Server %S neposkytuje služby IMAP4.
 
-## @name IMAP_DONE
-## @loc None
-5050=
+# This is intentionally left blank.
+imapDone=
 
-## @name IMAP_ENTER_PASSWORD_PROMPT_TITLE
-## @loc None
-5051=Poštový server vyžaduje heslo
+imapEnterPasswordPromptTitle=Poštový server vyžaduje heslo
 
-## @name IMAP_UNKNOWN_HOST_ERROR
-## @loc None
-5052=Nepodarilo sa spojiť so serverom %S.
+imapUnknownHostError=Nepodarilo sa spojiť so serverom %S.
 
-## @name IMAP_IMAP_CONNECTION_REFUSED_ERROR
-## @loc None
-5053=Nepodarilo sa pripojiť k serveru %S; spojenie odmietnuté.
+imapConnectionRefusedError=Nepodarilo sa pripojiť k serveru %S; spojenie odmietnuté.
 
-## @name IMAP_NET_TIMEOUT_ERROR
-## @loc None
-5054=Vypršal čas pre pripojenie k serveru %S.
+imapNetTimeoutError=Vypršal čas pre pripojenie k serveru %S.
 
 # Status - no messages to download
-## @name IMAP_NO_NEW_MESSAGES
-## @loc None
-5056=Server neobsahuje žiadne nové správy.
+imapNoNewMessages=Server neobsahuje žiadne nové správy.
 
-## @name IMAP_DEFAULT_ACCOUNT_NAME
-## @loc None
-5057=Pošta pre %S
+imapDefaultAccountName=Pošta pre %S
 
-## @name IMAP_SPECIAL_CHAR
-## @loc None
-5065=Znak %c je na tomto IMAP serveri rezervovaný. Zvoľte iný názov.
+imapSpecialChar=Znak %c je na tomto IMAP serveri rezervovaný. Zvoľte iný názov.
 
-## @name IMAP_PERSONAL_SHARED_FOLDER_TYPE_NAME
-## @loc None
-5066=Osobný priečinok
+imapPersonalSharedFolderTypeName=Osobný priečinok
 
-## @name IMAP_PUBLIC_FOLDER_TYPE_NAME
-## @loc None
-5067=Verejný priečinok
+imapPublicFolderTypeName=Verejný priečinok
 
-## @name IMAP_OTHER_USERS_FOLDER_TYPE_NAME
-## @loc None
-5068=Priečinok iného používateľa
+imapOtherUsersFolderTypeName=Priečinok iného používateľa
 
-## @name IMAP_PERSONAL_FOLDER_TYPE_DESCRIPTION
-## @loc None
-5069=Toto je osobný poštový priečinok. Nie je zdieľaný.
+imapPersonalFolderTypeDescription=Toto je osobný poštový priečinok. Nie je zdieľaný.
 
-## @name IMAP_PERSONAL_SHARED_FOLDER_TYPE_DESCRIPTION
-## @loc None
-5070=Toto je osobný poštový priečinok. Je zdieľaný.
+imapPersonalSharedFolderTypeDescription=Toto je osobný poštový priečinok. Je zdieľaný.
 
-## @name IMAP_PUBLIC_FOLDER_TYPE_DESCRIPTION
-## @loc None
-5071=Toto je verejný priečinok.
+imapPublicFolderTypeDescription=Toto je verejný priečinok.
 
-## @name IMAP_OTHER_USERS_FOLDER_TYPE_DESCRIPTION
-## @loc None
-5072=Toto je poštový priečinok zdieľaný používateľom '%S'.
+imapOtherUsersFolderTypeDescription=Toto je poštový priečinok zdieľaný používateľom '%S'.
 
-## @name IMAP_ACL_FULL_RIGHTS
-## @loc None
-5073=Úplná kontrola
+imapAclFullRights=Úplná kontrola
 
-## @name IMAP_ACL_LOOKUP_RIGHT
-## @loc None
-5074=Prehľadávať
+imapAclLookupRight=Prehľadávať
 
-## @name IMAP_ACL_READ_RIGHT
-## @loc None
-5075=Čítať
+imapAclReadRight=Čítať
 
-## @name IMAP_ACL_SEEN_RIGHT
-## @loc None
-5076=Nastaviť stav Prečítané/Neprečítané
+imapAclSeenRight=Nastaviť stav Prečítané/Neprečítané
 
-## @name IMAP_ACL_WRITE_RIGHT
-## @loc None
-5077=Zapísať
+imapAclWriteRight=Zapísať
 
-## @name IMAP_ACL_INSERT_RIGHT
-## @loc None
-5078=Vložiť (kopírovať do)
+imapAclInsertRight=Vložiť (kopírovať do)
 
-## @name IMAP_ACL_POST_RIGHT
-## @loc None
-5079=Poslať
+imapAclPostRight=Poslať
 
-## @name IMAP_ACL_CREATE_RIGHT
-## @loc None
-5080=Vytvoriť podpriečinok
+imapAclCreateRight=Vytvoriť podpriečinok
 
-## @name IMAP_ACL_DELETE_RIGHT
-## @loc None
-5081=Vymazať správy
+imapAclDeleteRight=Vymazať správy
 
-## @name IMAP_ACL_ADMINISTER_RIGHT
-## @loc None
-5082=Spravovať priečinok
+imapAclAdministerRight=Spravovať priečinok
 
-## @name IMAP_SERVER_DOESNT_SUPPORT_ACL
-## @loc None
-5084=Tento server nepodporuje zdieľané priečinky.
+imapServerDoesntSupportAcl=Tento server nepodporuje zdieľané priečinky.
 
-## @name IMAP_ACL_EXPUNGE_RIGHT
-## @loc None
-5085=Vyčistiť (Expunge)
+imapAclExpungeRight=Vyčistiť (Expunge)
 
-## @name IMAP_SERVER_DISCONNECTED
-## @loc None
-5090=Server %S sa odpojil. Server sa možno vypína alebo je problém so sieťou.
+imapServerDisconnected=Server %S sa odpojil. Server sa možno vypína alebo je problém so sieťou.
 
 # LOCALIZATION NOTE (autoSubscribeText): %1$S is the imap folder.
-5092=Chcete sa prihlásiť k odberu priečinka %1$S?
+imapSubscribePrompt=Chcete sa prihlásiť k odberu priečinka %1$S?
 
-## @name IMAP_SERVER_DROPPED_CONNECTION
-## @loc None
-5093=Nepodarilo sa spojiť so serverom IMAP. Je možné, že bol prekročený maximálny povolený počet pripojení na tento server. Pokiaľ k tomu došlo, znížte počet pripojení v dialógovom okne Pokročilé nastavenie servera IMAP.
+imapServerDroppedConnection=Nepodarilo sa spojiť so serverom IMAP. Je možné, že bol prekročený maximálny povolený počet pripojení na tento server. Pokiaľ k tomu došlo, znížte počet pripojení v dialógovom okne Pokročilé nastavenie servera IMAP.
 
-## @name IMAP_QUOTA_STATUS_FOLDERNOTOPEN
-## @loc None
-5095=Informácie o kvóte nie sú k dispozícii, pretože priečinok nie je otvorený.
+imapQuotaStatusFolderNotOpen=Informácie o kvóte nie sú k dispozícii, pretože priečinok nie je otvorený.
 
-## @name IMAP_QUOTA_STATUS_NOTSUPPORTED
-## @loc None
-5096=Tento server nepodporuje kvóty.
+imapQuotaStatusNotSupported=Tento server nepodporuje kvóty.
 
-## @name IMAP_QUOTA_STATUS_NOQUOTA
-## @loc None
-5097=Na tomto priečinku nie sú nastavené žiadne kvóty.
+imapQuotaStatusNoQuota=Na tomto priečinku nie sú nastavené žiadne kvóty.
 
 # Out of memory
-## @name IMAP_OUT_OF_MEMORY
-## @loc None
-5100=Aplikácia má nedostatok pamäte.
+imapOutOfMemory=Aplikácia má nedostatok pamäte.
 
-## @name IMAP_COPYING_MESSAGE_OF
-## @loc None
-# LOCALIZATION NOTE (Error 5103): Do not translate the word "%S" below.
+# LOCALIZATION NOTE (imapCopyingMessageOf): Do not translate the word "%S" below.
 # Place the word %3$S in your translation where the name of the destination folder should appear.
 # Place the word %1$S where the currently copying message should appear.
 # Place the word %2$S where the total number of messages should appear.
-5103=Kopírovanie správy %1$S z %2$S do priečinka %3$S
+imapCopyingMessageOf=Kopírovanie správy %1$S z %2$S do priečinka %3$S
 
-## @name IMAP_COPYING_MESSAGE_OF
-## @loc None
-# LOCALIZATION NOTE (Error 5103): Do not translate the word "%S" below.
-# Place the word %3$S in your translation where the name of the destination folder should appear.
-# Place the word %1$S where the currently copying message should appear.
-# Place the word %2$S where the total number of messages should appear.
-5103=Kopírovanie správy %1$S z %2$S do priečinka %3$S
-
-## @name IMAP_MOVE_FOLDER_TO_TRASH
-## @loc None
-# LOCALIZATION NOTE (5105): Do not translate the word %S below.
+# LOCALIZATION NOTE (imapMoveFolderToTrash): Do not translate the word %S below.
 # "%S" is the name of the folder.
-5105=Naozaj chcete odstrániť priečinok '%S'?
-
-## @name IMAP_DELETE_NO_TRASH
-## @loc None
-# LOCALIZATION NOTE (5106): Do not translate the word %S below.
-# "%S" is the name of the folder.
-5106=Odstránením tohto priečinka budú odstránené všetky správy a podpriečinky, ktoré priečinok obsahuje. Túto operáciu nie je možné vrátiť späť. Naozaj chcete odstrániť priečinok '%S'?
+imapMoveFolderToTrash=Naozaj chcete odstrániť priečinok '%S'?
 
-## @name IMAP_DELETE_FOLDER_DIALOG_TITLE
-## @loc None
-5107=Odstránenie priečinka
+# LOCALIZATION NOTE (imapDeleteNoTrash): Do not translate the word %S below.
+# "%S" is the name of the folder.
+imapDeleteNoTrash=Odstránením tohto priečinka budú odstránené všetky správy a podpriečinky, ktoré priečinok obsahuje. Túto operáciu nie je možné vrátiť späť. Naozaj chcete odstrániť priečinok '%S'?
 
-## @name IMAP_DELETE_FOLDER_BUTTON_LABEL
-## @loc None
-5108=O&dstrániť priečinok
+imapDeleteFolderDialogTitle=Odstránenie priečinka
+
+imapDeleteFolderButtonLabel=O&dstrániť priečinok
 
-## @name IMAP_AUTH_CHANGE_ENCRYPT_TO_PLAIN_SSL
-## @loc None
-# LOCALIZATION NOTE (5110): %S is the server hostname
-5110=Server IMAP %S zdá sa nepodporuje šifrované heslá. Ak ste si práve nastavili tento účet, skúste zmeniť nastavenie 'Metóda overenia' v okne 'Nastavenia účtov | Nastavenie servera' na 'Normálne heslo'. Ak toto predtým fungovalo a teraz náhle prestalo, kontaktujte správcu e-mailového servera alebo poskytovateľa e-mailovej služby.
+# LOCALIZATION NOTE (imapAuthChangeEncryptToPlainSSL): %S is the server hostname
+imapAuthChangeEncryptToPlainSSL=Server IMAP %S zdá sa nepodporuje šifrované heslá. Ak ste si práve nastavili tento účet, skúste zmeniť nastavenie 'Metóda overenia' v okne 'Nastavenia účtov | Nastavenie servera' na 'Normálne heslo'. Ak toto predtým fungovalo a teraz náhle prestalo, kontaktujte správcu e-mailového servera alebo poskytovateľa e-mailovej služby.
 
-## @name IMAP_AUTH_CHANGE_PLAIN_TO_ENCRYPT
-## @loc None
-# LOCALIZATION NOTE (5111): %S is the server hostname
-5111=Server IMAP %S nepovoľuje nezašifrované heslá. Skúste zmeniť nastavenie 'Metóda overenia' v okne 'Nastavenia účtov | Nastavenie servera' na 'Zašifrované heslo'.
-
-## @name IMAP_AUTH_CHANGE_ENCRYPT_TO_PLAIN_NO_SSL
-## @loc None
-# LOCALIZATION NOTE (5112): %S is the server hostname
-5112=Server IMAP %S zdá sa nepodporuje šifrované heslá. Ak ste si práve nastavili tento účet, skúste zmeniť nastavenie 'Metóda overenia' v okne 'Nastavenia účtov | Nastavenie servera' na 'Heslo odosielané nezabezpečene'.  Ak toto predtým fungovalo a teraz náhle prestalo, je možné, že sa niekto pokúša získať vaše heslo.
+# LOCALIZATION NOTE (imapAuthChangePlainToEncrypt): %S is the server hostname
+imapAuthChangePlainToEncrypt=Server IMAP %S nepovoľuje nezašifrované heslá. Skúste zmeniť nastavenie 'Metóda overenia' v okne 'Nastavenia účtov | Nastavenie servera' na 'Zašifrované heslo'.
 
-## @name IMAP_AUTH_MECH_NOT_SUPPORTED
-## @loc None
-# LOCALIZATION NOTE (5113): %S is the server hostname
-5113=Server IMAP %S nepodporuje zvolenú metódu overenia. Zmeňte nastavenie 'Metóda overenia' v okne 'Nastavenia účtov | Nastavenie servera'.
-
-## @name IMAP_AUTH_MECH_FAILED
-## @loc None
-# LOCALIZATION NOTE (5114): %S is the server hostname
-5114=Všetky možnosti pripojenia sa k serveru %S zlyhali. Skontrolujte zadané heslo alebo zmeňte nastavenie 'Metóda overenia' v okne 'Nastavenia účtov | Nastavenie servera'.
+# LOCALIZATION NOTE (imapAuthChangeEncryptToPlainNoSSL): %S is the server hostname
+imapAuthChangeEncryptToPlainNoSSL=Server IMAP %S zdá sa nepodporuje šifrované heslá. Ak ste si práve nastavili tento účet, skúste zmeniť nastavenie 'Metóda overenia' v okne 'Nastavenia účtov | Nastavenie servera' na 'Heslo odosielané nezabezpečene'.  Ak toto predtým fungovalo a teraz náhle prestalo, je možné, že sa niekto pokúša získať vaše heslo.
 
-## @name IMAP_AUTH_GSSAPI_FAILED
-## @loc None
-# LOCALIZATION NOTE (5115): %S is the server hostname
-5115=Tiket Kerberos/GSSAPI nebol serverom IMAP %S akceptovaný. Skontrolujte, či ste prihlásený k doméne Kerberos/GSSAPI realm.
+# LOCALIZATION NOTE (imapAuthMechFailed): %S is the server hostname
+imapAuthMechFailed=Všetky možnosti pripojenia sa k serveru %S zlyhali. Skontrolujte zadané heslo alebo zmeňte nastavenie 'Metóda overenia' v okne 'Nastavenia účtov | Nastavenie servera'.
 
-## @name IMAP_LOGIN_DISABLED
-## @loc None
-# LOCALIZATION NOTE (5116): %S is the account name
-5116=Nie je možné prihlásiť sa k účtu %S, pretože server neumožňuje overenie bez použitia STARTTLS alebo SSL/TLS. Skúste v nastaveniach účtu povoliť zabezpečené sieťové pripojenie alebo bezpečné overenie.
+# LOCALIZATION NOTE (imapAuthGssapiFailed): %S is the server hostname
+imapAuthGssapiFailed=Všetky možnosti pripojenia sa k serveru %S zlyhali. Skontrolujte zadané heslo alebo zmeňte nastavenie 'Metóda overenia' v okne 'Nastavenia účtov | Nastavenie servera'.
 
-## @name IMAP_SERVER_COMMAND_FAILED
-## @loc None
-# LOCALIZATION NOTE (5117):
+# LOCALIZATION NOTE (imapServerCommandFailed):
 # Place the word %1$S in your translation where the name of the account name should appear.
 # Place the word %2$S in your translation where the server response should appear.
-5117=Aktuálne vykonávaný príkaz zlyhal. Poštový server pre účet %1$S odpovedal: %2$S
+imapServerCommandFailed=Aktuálne vykonávaný príkaz zlyhal. Poštový server pre účet %1$S odpovedal: %2$S
 
-## @name IMAP_FOLDER_COMMAND_FAILED
-## @loc None
-# LOCALIZATION NOTE (5118): Do not translate the word %S below.
+# LOCALIZATION NOTE (imapFolderCommandFailed): Do not translate the word %S below.
 # Place the word %1$S in your translation where the name of the account should appear.
 # Place the word %2$S in your translation where the name of the folder should appear.
 # Place the word %3$S in your translation where the server response should appear.
-5118=Práve vykonávaná operácia na priečinku '%2$S' zlyhala. Poštový server pre účet %1$S odpovedal: %3$S
+imapFolderCommandFailed=Práve vykonávaná operácia na priečinku '%2$S' zlyhala. Poštový server pre účet %1$S odpovedal: %3$S
 
-## @name IMAP_SERVER_ALERT
-## @loc None
-# LOCALIZATION NOTE (5119):
+# LOCALIZATION NOTE (imapServerAlert):
 # Place the word %1$S in your translation where the name of the account should appear.
 # Place the word %2$S in your translation where the alert from the server should appear.
-5119=Upozornenie z účtu %1$S: %2$S
+imapServerAlert=Upozornenie z účtu %1$S: %2$S
--- a/suite/chrome/mailnews/localMsgs.properties
+++ b/suite/chrome/mailnews/localMsgs.properties
@@ -1,16 +1,20 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 #
 # The following are used by the local mail code to display progress/status/error messages
 #
 
+# LOCALIZATION NOTE(pop3ErrorDialogTitle): Do not translate the word "%S"
+# below. Place the word %S where the account name should appear.
+pop3ErrorDialogTitle=Chyba na účte %S
+    
 pop3EnterPasswordPromptTitle=Zadajte svoje heslo
 
 # LOCALIZATION NOTE(pop3EnterPasswordPrompt): Do not translate the words "%1$S"
 # and "%2$S" below. Place the word %1$S where the user name should appear, and
 # %2$S where the host name should appear.
 pop3EnterPasswordPrompt=Zadajte heslo pre %1$S na %2$S:
 
 # LOCALIZATION NOTE(pop3PreviouslyEnteredPasswordIsInvalidPrompt): Do not
@@ -55,17 +59,19 @@ localStatusDocumentDone=Hotovo
 # Status - pop3 server error
 #LOCALIZATION NOTE (pop3ServerError): Do not translate POP3 in the following line.
 pop3ServerError=Nastala chyba servera POP3.
 
 # Status - pop3 user name failed
 pop3UsernameFailure=Nastala chyba počas posielania používateľského mena na server.
 
 # Status - password failed
-pop3PasswordFailure=Nastala chyba počas posielania hesla na server.
+#LOCALIZATION NOTE (pop3PasswordFailed): Do not translate "%1$S" below.
+# Place the word %1$S where the user name should appear.
+pop3PasswordFailed=Odoslanie hesla pre používateľa %1$S zlyhalo.
 
 # Status - write error occurred
 pop3MessageWriteError=Nastala chyba počas ukladania správy. Uistite sa, že máte právo zapisovať do súborového systému a na zápis správy je dostatok miesta.
 
 # Status - retr failure from the server
 pop3RetrFailure=Vykonanie príkazu RETR bolo neúspešné. Chyba pri prijímaní správy.
 
 # Status - password undefined
--- a/suite/chrome/mailnews/messenger.dtd
+++ b/suite/chrome/mailnews/messenger.dtd
@@ -168,17 +168,17 @@
 <!ENTITY sortByAttachmentsCmd.accesskey "h">
 <!ENTITY sortAscending.label "Vzostupne">
 <!ENTITY sortAscending.accesskey "o">
 <!ENTITY sortDescending.label "Zostupne">
 <!ENTITY sortDescending.accesskey "s">
 <!ENTITY sortThreaded.label "Zreťazené usporiadanie">
 <!ENTITY sortThreaded.accesskey "Z">
 <!ENTITY sortUnthreaded.label "Klasické usporiadanie">
-<!ENTITY sortUnthreaded.accesskey "K">
+<!ENTITY sortUnthreaded.accesskey "d">
 <!ENTITY groupBySort.label "Triedením zoskupiť">
 <!ENTITY groupBySort.accesskey "T">
 <!ENTITY msgsMenu.label "Správy">
 <!ENTITY msgsMenu.accesskey "S">
 <!ENTITY threads.label "Vlákna">
 <!ENTITY threads.accesskey "V">
 <!ENTITY allMsgsCmd.label "Všetky">
 <!ENTITY allMsgsCmd.accesskey "V">
--- a/toolkit/chrome/global/findbar.dtd
+++ b/toolkit/chrome/global/findbar.dtd
@@ -1,21 +1,16 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!-- LOCALIZATION NOTE : FILE This file contains the entities needed to -->
 <!-- LOCALIZATION NOTE : FILE use the Find Bar. -->
 
-<!-- entities split out from browser.dtd -->
-<!ENTITY next.label "Ďalšie">
-<!ENTITY next.accesskey "a">
-<!ENTITY next.tooltip "Vyhľadať ďalší výskyt reťazca">
-<!ENTITY previous.label "Predchádzajúce">
-<!ENTITY previous.accesskey "e">
-<!ENTITY previous.tooltip "Vyhľadať predchádzajúci výskyt reťazca">
-<!ENTITY findCloseButton.tooltip "Zavrieť panel vyhľadávania">
-<!ENTITY highlight.label "Zvýrazniť">
-<!ENTITY highlight.accesskey "v">
-<!ENTITY highlight.tooltiptext "Zvýrazniť všetky výskyty hľadaného reťazca (Ctrl+Enter)">
-<!ENTITY caseSensitiveCheckbox.label "Rozlišovať veľké/malé písmená">
-<!ENTITY caseSensitiveCheckbox.accesskey "R">
-
+<!ENTITY next.tooltip "Vyhľadá ďalší výskyt reťazca">
+<!ENTITY previous.tooltip "Vyhľadá predchádzajúci výskyt reťazca">
+<!ENTITY findCloseButton.tooltip "Zavrie panel vyhľadávania">
+<!ENTITY highlightAll.label "Zvýrazniť všetky výskyty">
+<!ENTITY highlightAll.accesskey "v">
+<!ENTITY highlightAll.tooltiptext "Zvýrazní všetky výskyty hľadaného reťazca">
+<!ENTITY caseSensitive.label "Rozlišovať veľké/malé písmená">
+<!ENTITY caseSensitive.accesskey "R">
+<!ENTITY caseSensitive.tooltiptext "Vyhľadáva s rozlišovaním malých a veľkých písmen">
--- a/toolkit/chrome/global/findbar.properties
+++ b/toolkit/chrome/global/findbar.properties
@@ -1,15 +1,15 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 # strings used by the Find bar, split from browser.properties
 NotFound=Reťazec nebol nájdený
 WrappedToTop=Dosiahnutý koniec stránky, pokračuje sa od začiatku
 WrappedToBottom=Dosiahnutý začiatok stránky, pokračuje sa od konca
-NormalFindLabel=Hľadať:
-FastFindLabel=Rýchlo nájsť:
-FastFindLinksLabel=Rýchlo nájsť (len odkazy):
+NormalFind=Hľadať
+FastFind=Rýchlo nájsť
+FastFindLinks=Rýchlo nájsť (len odkazy)
 CaseSensitive=(Rozlišovať veľké/malé písmená)
 FoundMatchCount=Výskyty: %S
 FoundMatchesCount=Výskyty: %S
 FoundTooManyMatches=Výskyty: viac ako %S
new file mode 100644
--- /dev/null
+++ b/toolkit/chrome/global/resetProfile.properties
@@ -0,0 +1,12 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+# LOCALIZATION NOTE: These strings are used for profile reset.
+
+# LOCALIZATION NOTE (resetUnusedProfile.message): %S is brandShortName.
+resetUnusedProfile.message=Zdá sa, že program %S nebol dlhšiu dobu spustený. Chcete obnoviť jeho nastavenia do pôvodných nastavení s cieľom ponúknuť Vám čo najlepší zážitok? Mimochodom, vitajte späť!
+
+# LOCALIZATION NOTE (resetProfile.resetButton.label): %S is brandShortName.
+resetProfile.resetButton.label=Obnoviť %S…
+resetProfile.resetButton.accesskey=b
--- a/toolkit/chrome/mozapps/extensions/extensions.properties
+++ b/toolkit/chrome/mozapps/extensions/extensions.properties
@@ -8,17 +8,19 @@ aboutWindowCloseButton=Zavrieť
 #LOCALIZATION NOTE (aboutWindowVersionString) %S is the addon version
 aboutWindowVersionString=verzia %S
 #LOCALIZATION NOTE (aboutAddon) %S is the addon name
 aboutAddon=O doplnku %S
 
 #LOCALIZATION NOTE (uninstallNotice) %S is the add-on name
 uninstallNotice=Doplnok %S bol odstránený.
 
-#LOCALIZATION NOTE (numReviews) #1 is the number of reviews
+#LOCALIZATION NOTE (numReviews): Semicolon-separated list of plural forms.
+# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
+# #1 is the number of reviews
 numReviews=#1 recenzia;#1 recenzie;#1 recenzií
 
 #LOCALIZATION NOTE (dateUpdated) %S is the date the addon was last updated
 dateUpdated=Aktualizované: %S
 
 #LOCALIZATION NOTE (notification.incompatible) %1$S is the add-on name, %2$S is brand name, %3$S is application version
 notification.incompatible=Doplnok %1$S nie je kompatibilný s aplikáciou %2$S %3$S.
 #LOCALIZATION NOTE (notification.blocked) %1$S is the add-on name
@@ -101,17 +103,19 @@ installFromFile.filterName=Doplnky
 
 uninstallAddonTooltip=Odinštalovať tento doplnok
 uninstallAddonRestartRequiredTooltip=Odinštalovať tento doplnok (vyžaduje reštart)
 enableAddonTooltip=Povoliť tento doplnok
 enableAddonRestartRequiredTooltip=Povoliť tento doplnok (vyžaduje reštart)
 disableAddonTooltip=Zakázať tento doplnok
 disableAddonRestartRequiredTooltip=Zakázať tento doplnok (vyžaduje reštart)
 
-#LOCALIZATION NOTE (showAllSearchResults) #1 is the total number of search results
+#LOCALIZATION NOTE (showAllSearchResults): Semicolon-separated list of plural forms.
+# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
+# #1 is the total number of search results
 showAllSearchResults=Zobraziť nájdený výsledok;Zobraziť #1 nájdené výsledky;Zobraziť všetkých #1 nájdených výsledkov
 
 #LOCALIZATION NOTE (addon.purchase.label) displayed on a button in the list
 # view, %S is the price of the add-on including currency symbol
 addon.purchase.label=Kúpiť za %S…
 addon.purchase.tooltip=Navštíviť galériu doplnkov a kúpiť tento doplnok
 #LOCALIZATION NOTE (cmd.purchaseAddon.label) displayed on a button in the detail
 # view, %S is the price of the add-on including currency symbol
--- a/toolkit/chrome/mozapps/plugins/plugins.dtd
+++ b/toolkit/chrome/mozapps/plugins/plugins.dtd
@@ -35,17 +35,17 @@
 
 <!ENTITY missingPlugin                                       "Na zobrazenie tohto obsahu je potrebný zásuvný modul.">
 <!-- LOCALIZATION NOTE (tapToPlayPlugin): Mobile (used for touch interfaces) only has one type of plugin possible. -->
 <!ENTITY tapToPlayPlugin                                     "Ťuknutím sem aktivujete zásuvný modul">
 <!ENTITY clickToActivatePlugin                               "Aktivovať zásuvný modul.">
 <!ENTITY checkForUpdates                                     "Skontrolovať aktualizácie…">
 <!ENTITY disabledPlugin                                      "Tento zásuvný modul je zakázaný.">
 <!ENTITY blockedPlugin.label                                 "Tento zásuvný modul bol pre vašu ochranu zakázaný.">
-
+<!ENTITY hidePluginBtn.label                                 "Skryť zásuvný modul">
 <!ENTITY installPlugin                                       "Nainštalovať zásuvný modul…">
 <!ENTITY managePlugins                                       "Správa zásuvných modulov…">
 
 <!-- LOCALIZATION NOTE (reloadPlugin.pre): include a trailing space as needed -->
 <!-- LOCALIZATION NOTE (reloadPlugin.middle): avoid leading/trailing spaces, this text is a link -->
 <!-- LOCALIZATION NOTE (reloadPlugin.post): include a starting space as needed -->
 <!ENTITY reloadPlugin.pre                                    "Skúste ho obnoviť ">
 <!ENTITY reloadPlugin.middle                                 "opätovným načítaním stránky">
--- a/toolkit/chrome/places/places.properties
+++ b/toolkit/chrome/places/places.properties
@@ -25,8 +25,14 @@ finduri-MonthYear=%1$S %2$S
 localhost=(lokálne súbory)
 
 # LOCALIZATION NOTE (bookmarksArchiveFilename):
 # Do not change this string! It's used only to
 # detect older localized bookmark archives from
 # before bug 445704 was fixed. It will be removed
 # in a subsequent release.
 bookmarksArchiveFilename=záložky-%S.json
+
+# LOCALIZATION NOTE
+# The string is used for showing file size of each backup in the "fileRestorePopup" popup
+# %1$S is the file size
+# %2$S is the file size unit
+backupFileSizeText=%1$S %2$S