update
authorsektormaster@atlas.sk
Wed, 29 Oct 2008 15:57:54 +0100
changeset 27 4655fd4b6791e18a082f5a583c63ec9e4ff49997
parent 26 7a490c90d46d2d035b2f7c54d3b894a73b270557
child 28 ac0bf4d909d01956ec1b706d281d4b0a58990f16
push id1
push usersledru@mozilla.com
push dateFri, 05 Dec 2014 02:19:11 +0000
update
browser/chrome/browser/browser.dtd
browser/chrome/browser/browser.properties
browser/chrome/browser/sanitize.dtd
browser/chrome/browser/sessionstore.properties
browser/profile/chrome/userChrome-example.css
calendar/chrome/calendar/aboutDialog.dtd
calendar/chrome/calendar/calendar-event-dialog.dtd
calendar/chrome/calendar/calendar.dtd
calendar/chrome/calendar/menuOverlay.dtd
calendar/chrome/lightning/lightning.dtd
calendar/chrome/lightning/lightning.properties
calendar/chrome/sunbird/aboutDialog.dtd
calendar/chrome/sunbird/menuOverlay.dtd
calendar/chrome/sunbird/sunbird.dtd
mail/chrome/communicator/utilityOverlay.dtd
mail/chrome/messenger-newsblog/am-newsblog.dtd
mail/chrome/messenger-smime/msgCompSMIMEOverlay.dtd
mail/chrome/messenger/AccountManager.dtd
mail/chrome/messenger/AccountWizard.dtd
mail/chrome/messenger/FilterEditor.dtd
mail/chrome/messenger/SearchDialog.dtd
mail/chrome/messenger/addressbook/abMailListDialog.dtd
mail/chrome/messenger/addressbook/abMainWindow.dtd
mail/chrome/messenger/addressbook/pref-directory-add.dtd
mail/chrome/messenger/addressbook/pref-directory.dtd
mail/chrome/messenger/am-copies.dtd
mail/chrome/messenger/am-identities-list.dtd
mail/chrome/messenger/am-main.dtd
mail/chrome/messenger/am-offline.dtd
mail/chrome/messenger/am-server-advanced.dtd
mail/chrome/messenger/am-server-top.dtd
mail/chrome/messenger/am-smime.dtd
mail/chrome/messenger/credits.dtd
mail/chrome/messenger/fieldMapExport.dtd
mail/chrome/messenger/folderProps.dtd
mail/chrome/messenger/folderpane.dtd
mail/chrome/messenger/messenger.dtd
mail/chrome/messenger/messengercompose/messengercompose.dtd
mail/chrome/messenger/msgFolderPickerOverlay.dtd
mail/chrome/messenger/msgHdrViewOverlay.dtd
mail/chrome/messenger/preferences/advanced.dtd
mail/chrome/messenger/preferences/changeaction.dtd
mail/chrome/messenger/preferences/compose.dtd
mail/chrome/messenger/preferences/connection.dtd
mail/chrome/messenger/preferences/display.dtd
mail/chrome/messenger/preferences/downloads.dtd
mail/chrome/messenger/preferences/fonts.dtd
mail/chrome/messenger/preferences/general.dtd
mail/chrome/messenger/preferences/preferences.dtd
mail/chrome/messenger/preferences/privacy.dtd
mail/chrome/messenger/preferences/receipts.dtd
mail/chrome/messenger/preferences/sendoptions.dtd
mail/chrome/messenger/prefs.properties
mail/chrome/messenger/start.dtd
mail/chrome/messenger/tabmail.dtd
mail/chrome/messenger/virtualFolderName.dtd
mail/installer/custom.properties
security/manager/chrome/pipnss/pipnss.properties
suite/chrome/common/help/certs_prefs_help.xhtml
suite/chrome/common/help/composer_help.xhtml
suite/chrome/common/help/cs_nav_prefs_navigator.xhtml
suite/chrome/common/help/customize_help.xhtml
suite/chrome/common/help/forieusers.xhtml
suite/chrome/common/help/glossary.xhtml
suite/chrome/common/help/help-glossary.rdf
suite/chrome/common/help/help-index1.rdf
suite/chrome/common/help/nav_help.xhtml
suite/chrome/common/help/page_info_help.xhtml
suite/chrome/common/help/privacy_help.xhtml
suite/chrome/common/help/suite-toc.rdf
suite/chrome/common/help/using_certs_help.xhtml
suite/chrome/common/help/using_priv_help.xhtml
suite/chrome/common/help/validation_help.xhtml
suite/chrome/common/notification.properties
suite/chrome/mailnews/messenger.dtd
suite/chrome/mailnews/pref/AccountWizard.dtd
suite/chrome/mailnews/pref/pref-notifications.dtd
suite/chrome/mailnews/pref/prefs.properties
toolkit/chrome/global/contentAreaCommands.properties
toolkit/chrome/mozapps/help/help.dtd
toolkit/chrome/mozapps/update/updates.properties
--- a/browser/chrome/browser/browser.dtd
+++ b/browser/chrome/browser/browser.dtd
@@ -220,72 +220,99 @@
 <!ENTITY reloadCmd.commandkey "r">
 <!ENTITY reloadFrameCmd.label "Obnoviť rámec">
 <!ENTITY reloadFrameCmd.accesskey "b">
 <!ENTITY viewPartialSourceForSelectionCmd.label "Zobraziť zdrojový kód výberu">
 <!ENTITY viewPartialSourceForMathMLCmd.label "Zobraziť zdrojový kód MathML">
 <!-- LOCALIZATION NOTE (viewPartialSourceCmd.accesskey): This accesskey is used for both 
          viewPartialSourceForSelectionCmd.label and viewPartialSourceForMathMLCmd.label -->
 <!ENTITY viewPartialSourceCmd.accesskey "r">
-<!ENTITY viewPageSourceCmd.label "Zobraziť zdrojový kód stránky">
-<!ENTITY viewPageSourceCmd.accesskey "k">
-<!ENTITY viewFrameSourceCmd.label "Zobraziť zdrojový kód rámca">
+<!ENTITY viewPageSourceCmd.label      "Zobraziť zdrojový kód stránky">
+<!ENTITY viewPageSourceCmd.accesskey  "k">
+<!ENTITY viewFrameSourceCmd.label     "Zobraziť zdrojový kód rámca">
 <!ENTITY viewFrameSourceCmd.accesskey "r">
-<!ENTITY viewPageInfoCmd.label "Zobraziť informácie o stránke">
-<!ENTITY viewPageInfoCmd.accesskey "i">
-<!ENTITY viewFrameInfoCmd.label "Zobraziť informácie o rámci">
-<!ENTITY viewFrameInfoCmd.accesskey "i">
-<!ENTITY showImageCmd.label           "Načítať obrázok">
-<!ENTITY showImageCmd.accesskey       "t">
-<!ENTITY viewImageCmd.label "Zobraziť obrázok">
-<!ENTITY viewImageCmd.accesskey "b">
-<!ENTITY viewBGImageCmd.label "Zobraziť obrázok pozadia">
-<!ENTITY viewBGImageCmd.accesskey "b">
+<!ENTITY viewPageInfoCmd.label        "Zobraziť informácie o stránke">
+<!ENTITY viewPageInfoCmd.accesskey    "i">
+<!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 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">
-<!ENTITY bookmarkThisLinkCmd.label "Vytvoriť záložku pre tento odkaz">
+<!ENTITY bookmarkPageCmd2.label       "Vytvoriť záložku pre túto stránku">
+<!ENTITY bookmarkPageCmd2.accesskey   "z">
+<!ENTITY bookmarkThisLinkCmd.label    "Vytvoriť záložku pre tento odkaz">
 <!ENTITY bookmarkThisLinkCmd.accesskey "i">
-<!ENTITY bookmarkThisFrameCmd.label "Vytvoriť záložku pre tento rámec">
+<!ENTITY bookmarkThisFrameCmd.label   "Vytvoriť záložku pre tento rámec">
 <!ENTITY bookmarkThisFrameCmd.accesskey "V">
-<!ENTITY sendPageCmd.label "Odoslať odkaz…">
-<!ENTITY sendPageCmd.accesskey "l">
-<!ENTITY savePageCmd.label "Uložiť stránku ako…">
-<!ENTITY savePageCmd.accesskey "r">
+<!ENTITY sendPageCmd.label            "Odoslať odkaz…">
+<!ENTITY sendPageCmd.accesskey        "l">
+<!ENTITY savePageCmd.label            "Uložiť stránku ako…">
+<!ENTITY savePageCmd.accesskey        "r">
 <!-- alternate for content area context menu -->
 <!ENTITY savePageCmd.accesskey2       "U">
-<!ENTITY savePageCmd.commandkey "s">
-<!ENTITY saveFrameCmd.label "Uložiť rámec ako…">
-<!ENTITY saveFrameCmd.accesskey "m">
+<!ENTITY savePageCmd.commandkey       "s">
+<!ENTITY saveFrameCmd.label           "Uložiť rámec ako…">
+<!ENTITY saveFrameCmd.accesskey       "m">
 <!ENTITY printFrameCmd.label          "Vytlačiť rámec…">
 <!ENTITY printFrameCmd.accesskey      "c">
-<!ENTITY saveLinkCmd.label "Uložiť cieľ odkazu ako…">
-<!ENTITY saveLinkCmd.accesskey "d">
-<!ENTITY sendLinkCmd.label "Odoslať odkaz…">
-<!ENTITY sendLinkCmd.accesskey "s">
-<!ENTITY saveImageCmd.label "Uložiť obrázok ako…">
-<!ENTITY saveImageCmd.accesskey "U">
-<!ENTITY sendImageCmd.label "Odoslať obrázok…">
-<!ENTITY sendImageCmd.accesskey "r">
-<!ENTITY copyLinkCmd.label "Kopírovať adresu odkazu">
-<!ENTITY copyLinkCmd.accesskey "a">
+<!ENTITY saveLinkCmd.label            "Uložiť cieľ odkazu ako…">
+<!ENTITY saveLinkCmd.accesskey        "d">
+<!ENTITY sendLinkCmd.label            "Odoslať odkaz…">
+<!ENTITY sendLinkCmd.accesskey        "s">
+<!ENTITY saveImageCmd.label           "Uložiť obrázok ako…">
+<!ENTITY saveImageCmd.accesskey       "U">
+<!ENTITY saveVideoCmd.label           "Uložiť video ako…">
+<!ENTITY saveVideoCmd.accesskey       "U">
+<!ENTITY saveAudioCmd.label           "Uložiť zvuk ako…">
+<!ENTITY saveAudioCmd.accesskey       "U">
+<!ENTITY sendImageCmd.label           "Odoslať obrázok…">
+<!ENTITY sendImageCmd.accesskey       "r">
+<!ENTITY sendVideoCmd.label           "Odoslať video…">
+<!ENTITY sendVideoCmd.accesskey       "v">
+<!ENTITY sendAudioCmd.label           "Odoslať zvuk…">
+<!ENTITY sendAudioCmd.accesskey       "v">
+<!ENTITY copyLinkCmd.label            "Kopírovať adresu odkazu">
+<!ENTITY copyLinkCmd.accesskey        "a">
 <!ENTITY copyLinkTextCmd.label        "Kopírovať text odkazu">
 <!ENTITY copyLinkTextCmd.accesskey    "x">
-<!ENTITY copyImageCmd.label "Kopírovať adresu obrázka">
-<!ENTITY copyImageCmd.accesskey "e">
-<!ENTITY copyImageContentsCmd.label "Kopírovať obrázok">
-<!ENTITY copyImageContentsCmd.accesskey "v">
-<!ENTITY blockImageCmd.accesskey "z">
-<!ENTITY metadataCmd.label "Vlastnosti">
-<!ENTITY metadataCmd.accesskey           "l">
-<!ENTITY copyEmailCmd.label              "Kopírovať e-mailovú adresu">
-<!ENTITY copyEmailCmd.accesskey          "e">
-<!ENTITY thisFrameMenu.label             "Tento rámec">
-<!ENTITY thisFrameMenu.accesskey         "T">
+<!ENTITY copyImageCmd.label           "Kopírovať adresu obrázka">
+<!ENTITY copyImageCmd.accesskey       "e">
+<!ENTITY copyImageContentsCmd.label   "Kopírovať obrázok">
+<!ENTITY copyImageContentsCmd.accesskey  "v">
+<!ENTITY copyVideoURLCmd.label        "Kopírovať adresu videa">
+<!ENTITY copyVideoURLCmd.accesskey    "e">
+<!ENTITY copyAudioURLCmd.label        "Kopírovať adresu zvuku">
+<!ENTITY copyAudioURLCmd.accesskey    "e">
+<!ENTITY blockImageCmd.accesskey      "z">
+<!ENTITY metadataCmd.label            "Vlastnosti">
+<!ENTITY metadataCmd.accesskey        "l">
+<!ENTITY copyEmailCmd.label           "Kopírovať e-mailovú adresu">
+<!ENTITY copyEmailCmd.accesskey       "e">
+<!ENTITY thisFrameMenu.label          "Tento rámec">
+<!ENTITY thisFrameMenu.accesskey      "T">
+
+<!-- Media (video/audio) controls -->
+<!ENTITY mediaPlay.label             "Prehrať">
+<!ENTITY mediaPlay.accesskey         "P">
+<!ENTITY mediaPause.label            "Pozastaviť">
+<!ENTITY mediaPause.accesskey        "a">
+<!ENTITY mediaMute.label             "Stlmiť">
+<!ENTITY mediaMute.accesskey         "m">
+<!ENTITY mediaUnmute.label           "Zrušiť stlmenie">
+<!ENTITY mediaUnmute.accesskey       "Z">
+<!ENTITY mediaShowControls.label     "Zobraziť ovládanie">
+<!ENTITY mediaShowControls.accesskey "n">
+<!ENTITY mediaHideControls.label     "Skryť ovládanie">
+<!ENTITY mediaHideControls.accesskey "n">
+
 
 <!-- LOCALIZATION NOTE :
 fullZoomEnlargeCmd.commandkey3, fullZoomReduceCmd.commandkey2 and
 fullZoomResetCmd.commandkey2 are alternative acceleration keys for zoom.
 If shift key is needed with your locale popular keyboard for them,
 you can use these alternative items. Otherwise, their values should be empty.  -->
 
 <!ENTITY fullZoomEnlargeCmd.label       "Priblížiť">
--- a/browser/chrome/browser/browser.properties
+++ b/browser/chrome/browser/browser.properties
@@ -143,8 +143,21 @@ editBookmarkPanel.editBookmarkTitle=Upraviť túto záložku
 #
 geolocation.exactLocation=Presná poloha (presnosť 3 m)
 geolocation.exactLocationKey=e
 geolocation.neighborhoodLocation=Približná poloha (presnosť na 2 km)
 geolocation.neighborhoodLocationKey=r
 geolocation.nothingLocation=Nič
 geolocation.nothingLocationKey=N
 geolocation.requestMessage=Stránka %S chce vedieť, kde sa nachádzate. Môžete uviesť:
+
+# Phishing/Malware Notification Bar.
+# LOCALIZATION NOTE (notAForgery, notAnAttack)
+# The two button strings will never be shown at the same time, so
+# it's okay for them to have the same access key
+safebrowsing.getMeOutOfHereButton.label=Rýchlo odtiaľto preč!
+safebrowsing.getMeOutOfHereButton.accessKey=R
+safebrowsing.reportedWebForgery=Nahlásená podozrivá stránka!
+safebrowsing.notAForgeryButton.label=Toto nie je podozrivá stránka…
+safebrowsing.notAForgeryButton.accessKey=T
+safebrowsing.reportedAttackSite=Nahlásená škodlivá stránka!
+safebrowsing.notAnAttackButton.label=Toto nie je škodlivá stránka…
+safebrowsing.notAnAttackButton.accessKey=T
--- a/browser/chrome/browser/sanitize.dtd
+++ b/browser/chrome/browser/sanitize.dtd
@@ -1,25 +1,25 @@
-<!ENTITY sanitizeDialog.title "Odstránenie súkromných údajov">
+<!ENTITY sanitizeDialog.title         "Odstránenie súkromných údajov">
 
-<!ENTITY sanitizeItems.label "Vymazať nasledujúce položky:">
+<!ENTITY sanitizeItems.label          "Vymazať nasledujúce položky:">
 <!ENTITY clearDataSettings.label      "Pri odstraňovaní súkromných údajov v aplikácii &brandShortName; odstrániť nasledujúce údaje:">
 
 <!-- XXX rearrange entities to match physical layout when l10n isn't an issue -->
 
-<!ENTITY itemHistory.label "História">
-<!ENTITY itemHistory.accesskey "H">
+<!ENTITY itemHistory.label            "História">
+<!ENTITY itemHistory.accesskey        "H">
 <!ENTITY itemFormSearchHistory.label  "Uložené formuláre a história hľadania">
 <!ENTITY itemFormSearchHistory.accesskey "U">
-<!ENTITY itemPasswords.label "Uložené heslá">
-<!ENTITY itemPasswords.accesskey "e">
-<!ENTITY itemCookies.label "Cookies">
-<!ENTITY itemCookies.accesskey "C">
-<!ENTITY itemCache.label "Vyrovnávacia pamäť (cache)">
-<!ENTITY itemCache.accesskey "m">
+<!ENTITY itemPasswords.label          "Uložené heslá">
+<!ENTITY itemPasswords.accesskey      "e">
+<!ENTITY itemCookies.label            "Cookies">
+<!ENTITY itemCookies.accesskey        "C">
+<!ENTITY itemCache.label              "Vyrovnávacia pamäť (cache)">
+<!ENTITY itemCache.accesskey          "m">
 <!ENTITY itemOfflineApps.label        "Údaje stránok v režime offline">
 <!ENTITY itemOfflineApps.accesskey    "o">
-<!ENTITY itemDownloads.label "História preberania súborov">
-<!ENTITY itemDownloads.accesskey "s">
-<!ENTITY itemSessions.label "Autorizované relácie">
-<!ENTITY itemSessions.accesskey "A">
+<!ENTITY itemDownloads.label          "História preberania súborov">
+<!ENTITY itemDownloads.accesskey      "s">
+<!ENTITY itemActiveLogins.label       "Aktívne prihlásenia">
+<!ENTITY itemActiveLogins.accesskey   "A">
 <!ENTITY window.width                 "30em">
 
deleted file mode 100644
--- a/browser/chrome/browser/sessionstore.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-restoredTitle= %S – Obnovenie predchádzajúcej relácie 
-restoredMsg=Posledná relácia aplikácie %S bola nečakane ukončená. Máte možnosť obnoviť karty a okná predchádzajúcej relácie, alebo spustiť novú reláciu, ak sa domnievate, že sa problém týka stránky, ktorú ste prezerali.
-# Localization note: It is recommended that okTitle be longer than cancelTitle
-# so that hitting the more prominent button doesn't lead to dataloss (see bug 346264).
-okTitle=Obnoviť predchádzajúcu reláciu
-cancelTitle=Spustiť novú reláciu
--- a/browser/profile/chrome/userChrome-example.css
+++ b/browser/profile/chrome/userChrome-example.css
@@ -36,19 +36,11 @@
  * Zmena písma v paneli s adresou na písmo s pevnou šírkou znakov
  *  
  * #urlbar {
  *  font-family: monospace !important;
  * }
  */
   
 /*
- * Eliminácia indikátora aktivity a jeho pohybu:
- *
- * #throbber-box {
- *   display: none !important;
- * }
- */
-
-/*
  * Ďalšie príklady nájdete na http://www.mozilla.org/unix/customizing.html
  */
  
deleted file mode 100644
--- a/calendar/chrome/calendar/aboutDialog.dtd
+++ /dev/null
@@ -1,62 +0,0 @@
-<!-- -*- Mode: HTML; tab-width: 20; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-   - ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License
-   - Version 1.1 (the "License"); you may not use this file except in
-   - compliance with the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is Mozilla Firefox about dialog.
-   -
-   - The Initial Developer of the Original Code is 
-   - Blake Ross (blaker@netscape.com).
-   - Portions created by the Initial Developer are Copyright (C) 2002
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s): Matthew Willis <mattwillis@gmail.com>
-   -                 Ehsan Akhgari <ehsan.akhgari@gmail.com>
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the LGPL or the GPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-
-<!ENTITY aboutDialog.title      "O programe &brandFullName;">
-<!ENTITY copyright.label        "Tvorcovia">
-<!ENTITY copyright.accesskey    "T">
-<!ENTITY aboutLink.label        "&lt; O programe &brandFullName;">
-<!ENTITY aboutLink.accesskey    "O">
-<!ENTITY aboutVersion           "verzia">
-<!ENTITY copyrightText          "&#169;1998-2008 Prispievatelia. Všetky práva vyhradené. Mozilla Sunbird, Sunbird a logá Sunbird sú
-                                 ochranné známky patriace Mozilla Foundation. Všetky práva vyhradené.">
-
-<!ENTITY brandMotto       "Ide o čas">
-<!ENTITY credit.thanks    "Špeciálne poďakovanie">
-
-<!-- localization credits look like this: -->
-<!--
-<!ENTITY credit.translation
-  "<h3>Translators</h3><ul><li>Name Here</li></ul>">
--->
-<!ENTITY credit.translation "<h3>Preklad do slovenčiny</h3><ul><li>Branislav Rozbora</li><li>Vlado Valaštiak (wladow)</li></ul><h3>Korektúry</h3><ul><li>SlovakSoft</li></ul>"> 
-
-
-<!ENTITY credit.powered     "Poháňané jadrom">
-<!ENTITY license.and        "a">
-<!ENTITY cmdClose.macKey  "W">
-
--- a/calendar/chrome/calendar/calendar-event-dialog.dtd
+++ b/calendar/chrome/calendar/calendar-event-dialog.dtd
@@ -43,17 +43,17 @@
 
 <!ENTITY event.title.label                  "Upraviť položku" >
 
 <!ENTITY newevent.before.label              "pred" >
 <!ENTITY newevent.after.label               "po" >
 
 <!ENTITY newevent.from.label                "Od" >
 <!ENTITY newevent.to.label                  "Do" >
-<!ENTITY newevent.attendees.sendEmail.label "Odoslať e-mailom pozvánky pre účastníkov">
+<!ENTITY newevent.attendees.notify.label    "Upozorniť účastníkov">
 
 <!ENTITY newevent.status.label              "Stav" >
 <!ENTITY newevent.status.accesskey          "v" >
 <!ENTITY newevent.status.none.label         "Nešpecifikované" >
 <!ENTITY newevent.status.cancelled.label    "Zrušené" >
 <!ENTITY newevent.status.tentative.label    "Nepotvrdené" >
 <!ENTITY newevent.status.confirmed.label    "Potvrdené" >
 <!ENTITY newevent.status.needsaction.label  "Vyžaduje akciu" >
--- a/calendar/chrome/calendar/calendar.dtd
+++ b/calendar/chrome/calendar/calendar.dtd
@@ -41,40 +41,28 @@
    - the terms of any one of the MPL, the GPL or the LGPL.
    -
    - ***** END LICENSE BLOCK ***** -->
 
 <!-- General -->
 <!ENTITY calendar.calendar.label          "Kalendár">
 <!ENTITY calendar.calendar.accesskey      "K">
 
-<!ENTITY calendar.flat.topbar.choosedate       "Prejsť na dátum" >
-<!ENTITY calendar.flat.topbar.dayview          "Denný pohľad" >
-<!ENTITY calendar.dayview.accesskey            "D" >
-<!ENTITY calendar.flat.topbar.weekview         "Týždenný pohľad" >
-<!ENTITY calendar.weekview.accesskey           "T" >
-<!ENTITY calendar.flat.topbar.monthview        "Mesačný pohľad" >
-<!ENTITY calendar.monthview.accesskey          "M" >
-<!ENTITY calendar.flat.topbar.multiweekview    "Viactýždenný pohľad" >
-<!ENTITY calendar.multiweekview.accesskey      "V" >
 <!ENTITY calendar.dayView.key                  "1" >
 <!ENTITY calendar.weekView.key                 "2" >
 <!ENTITY calendar.multiweekView.key            "3" >
 <!ENTITY calendar.monthView.key                "4" >
 
 <!ENTITY calendar.newtask.button.tooltip             "Vytvorí novú úlohu" >
 <!ENTITY calendar.newevent.button.tooltip            "Vytvorí novú udalosť" >
-<!ENTITY calendar.delete.button.tooltip              "Odstráni zvolenú udalosť" >
 <!ENTITY calendar.edit.button.tooltip                "Upraví zvolenú udalosť" >
 
 <!ENTITY calendar.unifinder.todoitems.label          "Úlohy" >
 <!ENTITY calendar.unifinder.showcompletedtodos.label "Zobraziť dokončené úlohy">
 
-<!ENTITY calendar.calendartab.label        "Dátum">
-<!ENTITY calendar.listofcalendarstab.label "Kalendáre">
 <!ENTITY calendar.today.button.label       "Dnes">
 <!ENTITY calendar.tomorrow.button.label       "Zajtra">
 <!ENTITY calendar.soon.button.label           "Čoskoro">
 
 <!ENTITY calendar.events.filter.all.label               "Všetky udalosti">
 <!ENTITY calendar.events.filter.today.label             "Dnešné udalosti">
 <!ENTITY calendar.events.filter.future.label            "Všetky budúce udalosti">
 <!ENTITY calendar.events.filter.current.label           "Práve vybraný deň">
@@ -92,94 +80,67 @@
 <!ENTITY calendar.unifinder.tree.duedate.label          "Splniť do">
 <!ENTITY calendar.unifinder.tree.completeddate.label    "Dokončené">
 <!ENTITY calendar.unifinder.tree.categories.label       "Kategória">
 <!ENTITY calendar.unifinder.tree.location.label         "Miesto konania">
 <!ENTITY calendar.unifinder.tree.status.label           "Stav">
 <!ENTITY calendar.unifinder.tree.calendarname.label     "Názov kalendára">
 <!ENTITY calendar.unifinder.tree.duration.label         "Koniec za">
 <!ENTITY calendar.unifinder.close.tooltip               "Zavrieť vyhľadávanie udalostí a zoznam udalostí">
-<!ENTITY calendar.find.key                              "F">
 
 <!ENTITY calendar.today.button.tooltip            "Prejsť na dnešný deň" >
 <!ENTITY calendar.todaypane.button.tooltip        "Zobraziť panel Dnes" >
-<!ENTITY calendar.choosedate.button.tooltip       "Vybrať dátum pre prechod" >
 <!ENTITY calendar.unifinder.button.tooltip        "Hľadať a zobraziť udalosti" >
 
 <!ENTITY calendar.day.button.tooltip            "Zmení pohľad na denný" >
 <!ENTITY calendar.week.button.tooltip           "Zmení pohľad na týždenný" >
 <!ENTITY calendar.month.button.tooltip          "Zmení pohľad na mesačný" >
 <!ENTITY calendar.multiweek.button.tooltip      "Zmení pohľad na viactýždenný" >
 
 <!ENTITY calendar.nextday.button.tooltip        "Nasledujúci deň" >
 <!ENTITY calendar.prevday.button.tooltip        "Predchádzajúci deň" >
 <!ENTITY calendar.nextweek.button.tooltip       "Nasledujúci týždeň" >
 <!ENTITY calendar.prevweek.button.tooltip       "Predchádzajúci týždeň" >
 <!ENTITY calendar.nextmonth.button.tooltip      "Nasledujúci mesiac" >
 <!ENTITY calendar.prevmonth.button.tooltip      "Predchádzajúci mesiac" >
 
 <!ENTITY calendar.newtask.button.label          "Nová úloha" >
 <!ENTITY calendar.newevent.button.label         "Nová udalosť" >
-<!ENTITY calendar.delete.button.label           "Odstrániť" >
 <!ENTITY calendar.edit.button.label             "Upraviť" >
-
-<!ENTITY calendar.choosedate.button.label       "Vybrať dátum" >
-
-<!ENTITY calendar.cut.button.tooltip            "Vystrihnúť" >
-<!ENTITY calendar.copy.button.tooltip           "Kopírovať" >
-<!ENTITY calendar.paste.button.tooltip          "Prilepiť" >
-<!ENTITY calendar.print.button.tooltip          "Tlač kalendára" >
-
-<!ENTITY calendar.cut.button.label              "Vystrihnúť" >
-<!ENTITY calendar.copy.button.label             "Kopírovať" >
-<!ENTITY calendar.paste.button.label            "Prilepiť" >
 <!ENTITY calendar.print.button.label            "Tlačiť" >
 
 <!ENTITY calendar.import.button.tooltip            "Importovať udalosti z lokálneho súboru." >
 <!ENTITY calendar.export.button.tooltip            "Exportovať udalosti do lokálneho súboru." >
 <!ENTITY calendar.subscribe.button.tooltip         "Odoberať súbor s kalendárom zo vzdialeného servera." >
 <!ENTITY calendar.publish.button.tooltip           "Publikovať udalosti na vzdialený server." >
 
 <!ENTITY calendar.export.calendar                "Export kalendára…" >
 
 <!ENTITY calendar.import.button.label              "Import" >
 <!ENTITY calendar.export.button.label              "Export" >
 <!ENTITY calendar.subscribe.button.label           "Odber" >
 <!ENTITY calendar.publish.button.label             "Publikovanie" >
 <!ENTITY calendar.unifinder.button.label           "Hľadať udalosti" >
 
-<!ENTITY calendar.remotereload.button.label        "Aktualizovať" >
-<!ENTITY calendar.remotereload.button.tooltip      "Aktualizovať všetky vzdialené kalendáre" >
-
 <!ENTITY calendar.day.button.label                 "Deň" >
 <!ENTITY calendar.week.button.label                "Týždeň" >
 <!ENTITY calendar.month.button.label               "Mesiac" >
 <!ENTITY calendar.multiweek.button.label           "Viac týždňov" >
 <!ENTITY calendar.onlyworkday.checkbox.label       "Iba pracovné dni" >
 <!ENTITY calendar.onlyworkday.checkbox.accesskey   "r" >
 <!ENTITY calendar.displaytodos.checkbox.label      "Úlohy v pohľade" >
 <!ENTITY calendar.displaytodos.checkbox.accesskey  "h" >
 <!ENTITY calendar.completedtasks.checkbox.label     "Zobraziť dokončené úlohy" >
 <!ENTITY calendar.completedtasks.checkbox.accesskey "b" >
 
 <!ENTITY calendar.orientation.label "Otočiť" >
 <!ENTITY calendar.orientation.accesskey "o" >
 
-<!ENTITY calendar.menu.options.close.key        "W">
-
 <!ENTITY calendar.search.options.searchfor      " obsahujúce">
 
-<!ENTITY calendar.menu.numberofweeks.label          "Počet týždňov" >
-<!ENTITY calendar.menu.numberofweeks.accesskey      "P" >
-<!ENTITY calendar.menu.numberofweeks.2              "2 týždne" >
-<!ENTITY calendar.menu.numberofweeks.3              "3 týždne" >
-<!ENTITY calendar.menu.numberofweeks.4              "4 týždne" >
-<!ENTITY calendar.menu.numberofweeks.5              "5 týždňov" >
-<!ENTITY calendar.menu.numberofweeks.6              "6 týždňov" >
-
 <!ENTITY calendar.list.header.label                 "Kalendár">
 
 <!ENTITY calendar.task.filter.title.label           "Zobraziť">
 <!ENTITY calendar.task.filter.all.label             "Všetky">
 <!ENTITY calendar.task.filter.all.accesskey         "V">
 <!ENTITY calendar.task.filter.today.label           "Dnes">
 <!ENTITY calendar.task.filter.today.accesskey       "D">
 <!ENTITY calendar.task.filter.next7days.label       "Nasledujúcich 7 dní">
@@ -201,29 +162,20 @@
 <!ENTITY calendar.task.details.priority.high.label   "Vysoká">
 <!ENTITY calendar.task.details.status.label          "Stav:">
 <!ENTITY calendar.task.details.category.label        "Kategória:">
 <!ENTITY calendar.task.details.repeat.label          "Opakovať:">
 
 <!ENTITY calendar.task.category.button.tooltip  "Pridať úlohu do kategórie">
 <!ENTITY calendar.task.complete.button.tooltip  "Označiť vybrané úlohy ako dokončené">
 <!ENTITY calendar.task.priority.button.tooltip  "Zmeniť prioritu">
-<!ENTITY calendar.task.delete.button.tooltip    "Odstrániť označenú úlohu">
 
 <!-- Statusbar -->
 <!ENTITY statusText.label   "Dokument: Hotovo">
 
-<!-- customizable toolbars -->
-<!ENTITY calendar.context.customize.label             "Prispôsobiť…">
-<!ENTITY calendar.context.customize.accesskey         "P">
-<!ENTITY calendar.menu.customize.label                "Prispôsobiť panel nástrojov…">
-<!ENTITY calendar.menu.customize.accesskey            "P">
-<!ENTITY calendar.maintoolbar.name                    "Hlavný panel nástrojov">
-<!ENTITY calendar.maintoolbar.accesskey               "H">
-
 <!-- Context Menu -->
 <!ENTITY calendar.context.modifyorviewitem.label      "Otvoriť">
 <!ENTITY calendar.context.modifyorviewitem.accesskey  "O">
 <!ENTITY calendar.context.modifyorviewtask.label      "Otvoriť úlohu…">
 <!ENTITY calendar.context.modifyorviewtask.accesskey  "O">
 <!ENTITY calendar.context.newevent.label              "Nová udalosť…">
 <!ENTITY calendar.context.newevent.accesskey          "N">
 <!ENTITY calendar.context.newtodo.label               "Nová úloha…">
@@ -355,20 +307,16 @@
 <!ENTITY calendarproperties.format.label               "Formát:">
 <!ENTITY calendarproperties.location.label             "Umiestnenie:">
 <!ENTITY calendarproperties.name.label                 "Názov:">
 <!ENTITY calendarproperties.readonly.label             "Len na čítanie">
 <!ENTITY calendarproperties.firealarms.label           "Zobraziť upozornenia">
 <!ENTITY calendarproperties.cache.label                "Vyrovnávacia pamäť (EXPERIMENTÁLNE, vyžaduje reštart)">
 <!ENTITY calendarproperties.enabled.label              "Zapnúť tento kalendár">
 
-<!-- Sunbird Help -->
-<!ENTITY calendar.help.label                           "Obsah pomocníka">
-<!ENTITY calendar.help.accesskey                       "O">
-
 <!-- Calendar Publish Dialog -->
 <!ENTITY calendar.publish.dialog.title                 "Publikovať kalendár">
 <!ENTITY calendar.publish.url.label                    "Adresa URL:">
 <!ENTITY calendar.publish.publish.button               "Publikovať">
 <!ENTITY calendar.publish.close.button                 "Zavrieť">
 
 <!ENTITY calendar.publish.example.url.description      "Príklad: http://www.mojserver.sk/webdav/test.ics">
 
@@ -387,11 +335,8 @@
 <!ENTITY calendar.print.to.label "Do:">
 <!ENTITY calendar.print.settingsGroup.label "Nastavenia tlače">
 
 <!-- Error reporting -->
 <!ENTITY calendar.error.detail                  "Podrobnosti…">
 <!ENTITY calendar.error.number                  "Číslo chyby:">
 <!ENTITY calendar.error.description             "Popis:">
 <!ENTITY calendar.error.title                   "Vyskytla sa chyba:">
-
-<!-- LOCALIZATION NOTE (mainWindow.title): DONT_TRANSLATE -->
-<!ENTITY mainWindow.title                       "&brandFullName;">
--- a/calendar/chrome/calendar/menuOverlay.dtd
+++ b/calendar/chrome/calendar/menuOverlay.dtd
@@ -49,203 +49,68 @@
 <!ENTITY event.new.todo                         "Nová úloha…">
 <!ENTITY event.new.todo.key                     "T">
 <!ENTITY event.new.todo.accesskey               "h">
 
 <!ENTITY calendar.new.server.label              "Nový súbor kalendára…">
 <!ENTITY calendar.new.server.key                "L">
 <!ENTITY calendar.new.server.accesskey          "l">
 
-<!ENTITY calendar.open.file.label               "Otvoriť súbor kalendára…">
-<!ENTITY calendar.open.file.key                 "O">
-<!ENTITY calendar.open.file.accesskey           "O">
-
-<!ENTITY event.edit.event                       "Upraviť označené…">
-<!ENTITY event.edit.event.key                   "e">
-<!ENTITY event.edit.event.accesskey             "U">
-
-<!ENTITY event.delete.event                     "Odstrániť označené udalosti">
-<!ENTITY event.delete.event.accesskey           "t">
-
-<!ENTITY event.delete.tasks                     "Odstrániť označené úlohy">
-<!ENTITY event.delete.tasks.accesskey           "r">
-
 <!ENTITY calendar.print.label                   "Tlačiť…">
 <!ENTITY calendar.print.key                     "P">
 <!ENTITY calendar.print.accesskey               "T">
 
-<!ENTITY calendar.pagesetup.label               "Nastavenie tlače…">
-<!ENTITY calendar.pagesetup.accesskey           "N">
-
 <!ENTITY calendar.import.label                  "Importovať…">
 <!ENTITY calendar.import.key                    "I">
 <!ENTITY calendar.import.accesskey              "I">
 
 <!ENTITY calendar.export.calendar.label         "Exportovať kalendár…">
 <!ENTITY calendar.export.calendar.accesskey     "E">
 <!ENTITY calendar.export.selection.label        "Exportovať označené…">
 <!ENTITY calendar.export.selection.accesskey    "v">
 
-<!ENTITY calendar.subscribe.label               "Prijať vzdialený kalendár…">
-<!ENTITY calendar.subscribe.accesskey           "P">
-
-<!ENTITY calendar.reloadserver.label            "Aktualizovať vzdialené kalendáre">
-<!ENTITY calendar.reloadserver.key              "R">
-<!ENTITY calendar.reloadserver.accesskey        "A">
-
 <!ENTITY calendar.publish.label                 "Publikovať…">
 <!ENTITY calendar.publish.accesskey             "b">
-<!ENTITY calendar.publish.calendar.label        "Publikovať kalendár…">
-<!ENTITY calendar.publish.calendar.accesskey    "b">
-<!ENTITY calendar.publish.selection.label       "Publikovať označené…">
-<!ENTITY calendar.publish.selection.accesskey   "z">
-
-<!ENTITY calendar.quit.label                    "Koniec">
-<!ENTITY calendar.quit.accesskey                "K">
-<!ENTITY calendar.quit.key                      "Q">
-<!ENTITY calendar.quit.label.mac                "Ukončiť &brandShortName;">
-
-<!ENTITY calendar.exit.label                    "Koniec">
-<!ENTITY calendar.exit.accesskey                "K">
-
-<!ENTITY calendar.undo.label                    "Späť">
-<!ENTITY calendar.undo.key                      "Z">
-<!ENTITY calendar.undo.accesskey                "S">
-
-<!ENTITY calendar.redo.label                    "Znovu">
-<!ENTITY calendar.redo.key                      "Y">
-<!ENTITY calendar.redo.accesskey                "Z">
-
-<!ENTITY calendar.cut.label                     "Vystrihnúť">
-<!ENTITY calendar.cut.key                       "X">
-<!ENTITY calendar.cut.accesskey                 "V">
-
-<!ENTITY calendar.copy.label                    "Kopírovať">
-<!ENTITY calendar.copy.key                      "C">
-<!ENTITY calendar.copy.accesskey                "K">
-
-<!ENTITY calendar.paste.label                   "Prilepiť">
-<!ENTITY calendar.paste.key                     "V">
-<!ENTITY calendar.paste.accesskey               "P">
-
-<!ENTITY calendar.selectall.label               "Vybrať všetko">
-<!ENTITY calendar.selectall.key                 "a">
-<!ENTITY calendar.selectall.accesskey           "a">
-
-<!ENTITY toolbarsMenu.label                     "Panely nástrojov">
-<!ENTITY toolbarsMenu.accesskey                 "n">
 
 <!ENTITY calendar.toolbar.label                 "Panel Kalendár">
-<!ENTITY calendar.toolbar.accesskey             "n">
+<!ENTITY calendar.toolbar.accesskey             "K">
 <!ENTITY task.toolbar.label                     "Panel Úloha">
-<!ENTITY task.toolbar.accesskey                 "l">
+<!ENTITY task.toolbar.accesskey                 "h">
 
 <!ENTITY calendar.menu.customize.label          "Prispôsobiť…">
 <!ENTITY calendar.menu.customize.accesskey      "P">
 
-<!ENTITY showStatusBarCmd.label                 "Stavový riadok">
-<!ENTITY showStatusBarCmd.accesskey             "a">
-
-<!ENTITY showTaskBoxCmd.label                   "Zoznam úloh">
-<!ENTITY showTaskBoxCmd.accesskey               "Z">
-
 <!ENTITY showUnifinderCmd.label                 "Hľadať udalosti">
 <!ENTITY showUnifinderCmd.accesskey             "H">
 
 <!ENTITY calendar.displaytodos.checkbox.label       "Zobraziť úlohy v kalendári">
 <!ENTITY calendar.displaytodos.checkbox.accesskey   "k">
 
 <!ENTITY calendar.menu.numberofweeks.label      "Viac týždňov">
 <!ENTITY calendar.menu.numberofweeks.2          "Dva týždne">
 <!ENTITY calendar.menu.numberofweeks.3          "Tri týždne">
 <!ENTITY calendar.menu.numberofweeks.4          "Štyri týždne">
 <!ENTITY calendar.menu.numberofweeks.5          "Päť týždňov">
 <!ENTITY calendar.menu.numberofweeks.6          "Šesť týždňov">
 
-<!ENTITY calendar.fullscreen.label              "Na celú obrazovku">
-<!ENTITY calendar.fullscreen.accesskey          "c">
-
-<!ENTITY calendar.addons.label                  "Doplnky">
-<!ENTITY calendar.addons.accesskey              "D">
-
-<!ENTITY goMenu.label                           "Prejsť na">
-<!ENTITY goMenu.accesskey                       "r">
-
 <!ENTITY goTodayCmd.label                       "Dnešný deň">
-<!ENTITY goTodayCmd.accesskey                   "d">
-
-<!ENTITY goDateCmd.label                        "Dátum…">
-<!ENTITY goDateCmd.accesskey                    "t">
+<!ENTITY goTodayCmd.accesskey                   "D">
 
 <!ENTITY goPreviousCmd.day.label                "Predchádzajúci deň">
 <!ENTITY goPreviousCmd.week.label               "Predchádzajúci týždeň">
 <!ENTITY goPreviousCmd.month.label              "Predchádzajúci mesiac">
 <!ENTITY goPreviousCmd.accesskey                "r">
 
 <!ENTITY goNextCmd.day.label                    "Nasledujúci deň">
 <!ENTITY goNextCmd.week.label                   "Nasledujúci týždeň">
 <!ENTITY goNextCmd.month.label                  "Nasledujúci mesiac">
 <!ENTITY goNextCmd.all.accesskey                "a">
 
-<!ENTITY toolsMenu.label                        "Nástroje">
-<!ENTITY toolsMenu.accesskey                    "N">
-
-<!ENTITY errorConsoleCmd.label                  "Chybová konzola">
-<!ENTITY errorConsoleCmd.accesskey              "K">
-
 <!ENTITY addressBookCmd.label                   "Adresár">
 <!ENTITY addressBookCmd.accesskey               "A">
 
-<!ENTITY helpMenu.label                         "Pomocník">
-<!ENTITY helpMenu.accesskey                     "P">
-<!-- LOCALIZATION NOTE some localizations of Windows use "?"
-           for the help button in the menubar but Gnome does not.   -->
-<!ENTITY helpMenuWin.label                      "Pomocník"> 
-<!ENTITY helpMenuWin.accesskey                  "P">
-
-<!-- Toolbar items -->
-<!ENTITY fileMenu.label                         "Súbor">
-<!ENTITY fileMenu.accesskey                     "S">
-
-<!ENTITY editMenu.label                         "Upraviť">
-<!ENTITY editMenu.accesskey                     "U">
-<!ENTITY optionsCmd.label                       "Možnosti…">
-<!ENTITY optionsCmd.accesskey                   "M">
-<!ENTITY preferencesCmd.label                   "Možnosti">
-<!ENTITY preferencesCmd.accesskey               "M">
-<!ENTITY preferencesCmdMac.label                "Možnosti…">
-<!ENTITY preferencesCmdMac.commandkey           ",">
-<!ENTITY preferencesCmdMac.modifiers            "accel">
-
-<!ENTITY viewMenu.label                         "Zobraziť">
-<!ENTITY viewMenu.accesskey                     "Z">
-
-<!ENTITY releaseCmd.label                       "Poznámky k vydaniu">
-<!ENTITY releaseCmd.accesskey                   "P">
-<!ENTITY aboutCmd.label                         "O programe &brandFullName;">
-<!ENTITY aboutCmd.accesskey                     "m">
-<!ENTITY updateCmd.label                        "Kontrola aktualizácií…">
-<!ENTITY updateCmd.accesskey                    "a">
-
-<!-- Mac OS X "Window" menu items -->
-<!ENTITY windowMenu.label                       "Okno">
-<!ENTITY minimizeWindow.label                   "Minimalizovať">
-<!ENTITY zoomWindow.label                       "Lupa">
-<!ENTITY minimizeWindow.key                     "M">
-<!ENTITY bringAllToFront.label                  "Preniesť všetko do popredia">
-
-<!-- Mac OS X Application menu items -->
-<!ENTITY servicesMenuMac.label          "Služby">
-<!ENTITY hideThisAppCmdMac.label        "Skryť &brandShortName;">
-<!ENTITY hideThisAppCmdMac.commandkey   "H">
-<!ENTITY hideThisAppCmdMac.modifiers    "accel">
-<!ENTITY hideOtherAppsCmdMac.label      "Skryť ostatné">
-<!ENTITY hideOtherAppsCmdMac.commandkey "H">
-<!ENTITY hideOtherAppsCmdMac.modifiers  "accel,alt">
-<!ENTITY showAllAppsCmdMac.label        "Zobraziť všetko">
-
 <!ENTITY calendar.importcalendar.label          "Import kalendára…">
 
 <!ENTITY showCurrentView.label                  "Aktuálny pohľad">
 <!ENTITY showCurrentView.accesskey              "A">
 
 <!ENTITY calendar.properties.label              "Vlastnosti kalendára…">
 <!ENTITY calendar.properties.accesskey          "l">
--- a/calendar/chrome/lightning/lightning.dtd
+++ b/calendar/chrome/lightning/lightning.dtd
@@ -56,18 +56,16 @@
 <!ENTITY lightning.menupopup.open.label               "Otvoriť">
 <!ENTITY lightning.menupopup.open.accesskey           "O">
 <!ENTITY lightning.menupopup.open.message.label       "Uloženú správu…">
 <!ENTITY lightning.menupopup.open.message.accesskey   "U">
 <!ENTITY lightning.menupopup.open.calendar.label      "Súbor kalendára…">
 <!ENTITY lightning.menupopup.open.calendar.accesskey  "k">
 
 <!-- Messenger Sidebar -->
-<!ENTITY lightning.sidebar.invitations.label "Pozvánky">
-<!ENTITY lightning.sidebar.invitations.accesskey "P">
 <!ENTITY lightning.calendar.label            "Kalendár">
 <!ENTITY lightning.calendar.accesskey        "K">
 <!ENTITY lightning.tasks.label               "Úlohy">
 <!ENTITY lightning.tasks.accesskey           "l">
 
 <!-- Mode Toolbar -->
 <!ENTITY lightning.toolbar.mail.label         "Pošta">
 <!ENTITY lightning.toolbar.mail.accesskey     "o">
--- a/calendar/chrome/lightning/lightning.properties
+++ b/calendar/chrome/lightning/lightning.properties
@@ -74,8 +74,10 @@ imipNoIdentity=žiadna
 
 itipReplySubject=Odpoveď na pozvánku: %1$S
 itipReplyBodyAccept=%1$S prijal vašu pozvánku na udalosť.
 itipReplyBodyDecline=%1$S odmietol vašu pozvánku na udalosť.
 itipRequestSubject=Pozvánka: %1$S
 itipRequestBody=%1$S vás pozval na %2$S
 itipCancelSubject=Zrušená udalosť: %1$S
 itipCancelBody=%1$S zrušil túto udalosť: « %2$S »
+
+invitationsLink.label=Pozvánky: %1$S
new file mode 100644
--- /dev/null
+++ b/calendar/chrome/sunbird/aboutDialog.dtd
@@ -0,0 +1,62 @@
+<!-- -*- Mode: HTML; tab-width: 20; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+   - ***** BEGIN LICENSE BLOCK *****
+   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
+   -
+   - The contents of this file are subject to the Mozilla Public License
+   - Version 1.1 (the "License"); you may not use this file except in
+   - compliance with the License. You may obtain a copy of the License at
+   - http://www.mozilla.org/MPL/
+   -
+   - Software distributed under the License is distributed on an "AS IS" basis,
+   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+   - for the specific language governing rights and limitations under the
+   - License.
+   -
+   - The Original Code is Mozilla Firefox about dialog.
+   -
+   - The Initial Developer of the Original Code is 
+   - Blake Ross (blaker@netscape.com).
+   - Portions created by the Initial Developer are Copyright (C) 2002
+   - the Initial Developer. All Rights Reserved.
+   -
+   - Contributor(s): Matthew Willis <mattwillis@gmail.com>
+   -                 Ehsan Akhgari <ehsan.akhgari@gmail.com>
+   -
+   - Alternatively, the contents of this file may be used under the terms of
+   - either the GNU General Public License Version 2 or later (the "GPL"), or
+   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+   - in which case the provisions of the GPL or the LGPL are applicable instead
+   - of those above. If you wish to allow use of your version of this file only
+   - under the terms of either the GPL or the LGPL, and not to allow others to
+   - use your version of this file under the terms of the MPL, indicate your
+   - decision by deleting the provisions above and replace them with the notice
+   - and other provisions required by the LGPL or the GPL. If you do not delete
+   - the provisions above, a recipient may use your version of this file under
+   - the terms of any one of the MPL, the GPL or the LGPL.
+   -
+   - ***** END LICENSE BLOCK ***** -->
+
+<!ENTITY aboutDialog.title      "O programe &brandFullName;">
+<!ENTITY copyright.label        "Tvorcovia">
+<!ENTITY copyright.accesskey    "T">
+<!ENTITY aboutLink.label        "&lt; O programe &brandFullName;">
+<!ENTITY aboutLink.accesskey    "O">
+<!ENTITY aboutVersion           "verzia">
+<!ENTITY copyrightText          "&#169;1998-2008 Prispievatelia. Všetky práva vyhradené. Mozilla Sunbird, Sunbird a logá Sunbird sú
+                                 ochranné známky patriace Mozilla Foundation. Všetky práva vyhradené.">
+
+<!ENTITY brandMotto       "Ide o čas">
+<!ENTITY credit.thanks    "Špeciálne poďakovanie">
+
+<!-- localization credits look like this: -->
+<!--
+<!ENTITY credit.translation
+  "<h3>Translators</h3><ul><li>Name Here</li></ul>">
+-->
+<!ENTITY credit.translation "<h3>Preklad do slovenčiny</h3><ul><li>Branislav Rozbora</li><li>Vlado Valaštiak (wladow)</li></ul><h3>Korektúry</h3><ul><li>SlovakSoft</li></ul>"> 
+
+
+<!ENTITY credit.powered     "Poháňané jadrom">
+<!ENTITY license.and        "a">
+<!ENTITY cmdClose.macKey  "W">
+
new file mode 100644
--- /dev/null
+++ b/calendar/chrome/sunbird/menuOverlay.dtd
@@ -0,0 +1,182 @@
+<!-- ***** BEGIN LICENSE BLOCK *****
+   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
+   -
+   - The contents of this file are subject to the Mozilla Public License Version
+   - 1.1 (the "License"); you may not use this file except in compliance with
+   - the License. You may obtain a copy of the License at
+   - http://www.mozilla.org/MPL/
+   -
+   - Software distributed under the License is distributed on an "AS IS" basis,
+   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+   - for the specific language governing rights and limitations under the
+   - License.
+   -
+   - The Original Code is OEone Calendar Code, released October 31st, 2001.   -
+   -
+   - The Initial Developer of the Original Code is
+   -   OEone Corporation.
+   - Portions created by the Initial Developer are Copyright (C) 2001
+   - the Initial Developer. All Rights Reserved.
+   -
+   - Contributor(s):
+   -   Garth Smedley <garths@oeone.com>
+   -   Mike Potter <mikep@oeone.com>
+   -   Chris Charabaruk <coldacid@meldstar.com>
+   -   Matthew Willis <mattwillis@gmail.com>
+   -   Stefan Sitter <ssitter@googlemail.com>
+   -   Berend Cornelius <berend.cornelius@sun.com>
+   -   Philipp Kewisch <mozilla@kewis.ch>
+   -   Simon Paquet <bugzilla@babylonsounds.com>
+   -
+   - Alternatively, the contents of this file may be used under the terms of
+   - either the GNU General Public License Version 2 or later (the "GPL"), or
+   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+   - in which case the provisions of the GPL or the LGPL are applicable instead
+   - of those above. If you wish to allow use of your version of this file only
+   - under the terms of either the GPL or the LGPL, and not to allow others to
+   - use your version of this file under the terms of the MPL, indicate your
+   - decision by deleting the provisions above and replace them with the notice
+   - and other provisions required by the LGPL or the GPL. If you do not delete
+   - the provisions above, a recipient may use your version of this file under
+   - the terms of any one of the MPL, the GPL or the LGPL.
+   -
+   - ***** END LICENSE BLOCK ***** -->
+
+<!ENTITY calendar.open.file.label               "Otvoriť súbor kalendára…">
+<!ENTITY calendar.open.file.key                 "O">
+<!ENTITY calendar.open.file.accesskey           "O">
+
+<!ENTITY event.edit.event                       "Upraviť označené…">
+<!ENTITY event.edit.event.key                   "e">
+<!ENTITY event.edit.event.accesskey             "U">
+
+<!ENTITY event.delete.event                     "Odstrániť označené udalosti">
+<!ENTITY event.delete.event.accesskey           "t">
+
+<!ENTITY event.delete.tasks                     "Odstrániť označené úlohy">
+<!ENTITY event.delete.tasks.accesskey           "r">
+
+<!ENTITY calendar.pagesetup.label               "Nastavenie tlače…">
+<!ENTITY calendar.pagesetup.accesskey           "N">
+
+<!ENTITY calendar.subscribe.label               "Prijať vzdialený kalendár…">
+<!ENTITY calendar.subscribe.accesskey           "P">
+
+<!ENTITY calendar.reloadserver.label            "Aktualizovať vzdialené kalendáre">
+<!ENTITY calendar.reloadserver.key              "R">
+<!ENTITY calendar.reloadserver.accesskey        "A">
+
+<!ENTITY calendar.publish.calendar.label        "Publikovať kalendár…">
+<!ENTITY calendar.publish.calendar.accesskey    "b">
+<!ENTITY calendar.publish.selection.label       "Publikovať označené…">
+<!ENTITY calendar.publish.selection.accesskey   "z">
+
+<!ENTITY calendar.quit.label                    "Koniec">
+<!ENTITY calendar.quit.accesskey                "K">
+<!ENTITY calendar.quit.key                      "Q">
+<!ENTITY calendar.quit.label.mac                "Ukončiť &brandShortName;">
+
+<!ENTITY calendar.exit.label                    "Koniec">
+<!ENTITY calendar.exit.accesskey                "K">
+
+<!ENTITY calendar.undo.label                    "Späť">
+<!ENTITY calendar.undo.key                      "Z">
+<!ENTITY calendar.undo.accesskey                "S">
+
+<!ENTITY calendar.redo.label                    "Znovu">
+<!ENTITY calendar.redo.key                      "Y">
+<!ENTITY calendar.redo.accesskey                "Z">
+
+<!ENTITY calendar.cut.label                     "Vystrihnúť">
+<!ENTITY calendar.cut.key                       "X">
+<!ENTITY calendar.cut.accesskey                 "V">
+
+<!ENTITY calendar.copy.label                    "Kopírovať">
+<!ENTITY calendar.copy.key                      "C">
+<!ENTITY calendar.copy.accesskey                "K">
+
+<!ENTITY calendar.paste.label                   "Prilepiť">
+<!ENTITY calendar.paste.key                     "V">
+<!ENTITY calendar.paste.accesskey               "P">
+
+<!ENTITY calendar.selectall.label               "Vybrať všetko">
+<!ENTITY calendar.selectall.key                 "a">
+<!ENTITY calendar.selectall.accesskey           "a">
+
+<!ENTITY toolbarsMenu.label                     "Panely nástrojov">
+<!ENTITY toolbarsMenu.accesskey                 "n">
+
+<!ENTITY showStatusBarCmd.label                 "Stavový riadok">
+<!ENTITY showStatusBarCmd.accesskey             "a">
+
+<!ENTITY showTaskBoxCmd.label                   "Zoznam úloh">
+<!ENTITY showTaskBoxCmd.accesskey               "Z">
+
+<!ENTITY calendar.fullscreen.label              "Na celú obrazovku">
+<!ENTITY calendar.fullscreen.accesskey          "c">
+
+<!ENTITY calendar.addons.label                  "Doplnky">
+<!ENTITY calendar.addons.accesskey              "D">
+
+<!ENTITY goMenu.label                           "Prejsť na">
+<!ENTITY goMenu.accesskey                       "r">
+
+<!ENTITY goDateCmd.label                        "Dátum…">
+<!ENTITY goDateCmd.accesskey                    "t">
+
+<!ENTITY toolsMenu.label                        "Nástroje">
+<!ENTITY toolsMenu.accesskey                    "N">
+
+<!ENTITY errorConsoleCmd.label                  "Chybová konzola">
+<!ENTITY errorConsoleCmd.accesskey              "K">
+
+<!ENTITY helpMenu.label                         "Pomocník">
+<!ENTITY helpMenu.accesskey                     "P">
+<!-- LOCALIZATION NOTE some localizations of Windows use "?"
+           for the help button in the menubar but Gnome does not.   -->
+<!ENTITY helpMenuWin.label                      "Pomocník"> 
+<!ENTITY helpMenuWin.accesskey                  "P">
+
+<!ENTITY fileMenu.label                         "Súbor">
+<!ENTITY fileMenu.accesskey                     "S">
+
+<!ENTITY editMenu.label                         "Upraviť">
+<!ENTITY editMenu.accesskey                     "U">
+
+<!ENTITY optionsCmd.label                       "Možnosti…">
+<!ENTITY optionsCmd.accesskey                   "M">
+
+<!ENTITY preferencesCmd.label                   "Možnosti">
+<!ENTITY preferencesCmd.accesskey               "M">
+<!ENTITY preferencesCmdMac.label                "Možnosti…">
+<!ENTITY preferencesCmdMac.commandkey           ",">
+<!ENTITY preferencesCmdMac.modifiers            "accel">
+
+<!ENTITY viewMenu.label                         "Zobraziť">
+<!ENTITY viewMenu.accesskey                     "Z">
+
+<!ENTITY releaseCmd.label                       "Poznámky k vydaniu">
+<!ENTITY releaseCmd.accesskey                   "P">
+
+<!ENTITY aboutCmd.label                         "O programe &brandFullName;">
+<!ENTITY aboutCmd.accesskey                     "m">
+
+<!ENTITY updateCmd.label                        "Kontrola aktualizácií…">
+<!ENTITY updateCmd.accesskey                    "a">
+
+<!-- Mac OS X "Window" menu items -->
+<!ENTITY windowMenu.label                       "Okno">
+<!ENTITY minimizeWindow.label                   "Minimalizovať">
+<!ENTITY zoomWindow.label                       "Lupa">
+<!ENTITY minimizeWindow.key                     "M">
+<!ENTITY bringAllToFront.label                  "Preniesť všetko do popredia">
+
+<!-- Mac OS X Application menu items -->
+<!ENTITY servicesMenuMac.label          "Služby">
+<!ENTITY hideThisAppCmdMac.label        "Skryť &brandShortName;">
+<!ENTITY hideThisAppCmdMac.commandkey   "H">
+<!ENTITY hideThisAppCmdMac.modifiers    "accel">
+<!ENTITY hideOtherAppsCmdMac.label      "Skryť ostatné">
+<!ENTITY hideOtherAppsCmdMac.commandkey "H">
+<!ENTITY hideOtherAppsCmdMac.modifiers  "accel,alt">
+<!ENTITY showAllAppsCmdMac.label        "Zobraziť všetko">
new file mode 100644
--- /dev/null
+++ b/calendar/chrome/sunbird/sunbird.dtd
@@ -0,0 +1,91 @@
+<!-- ***** BEGIN LICENSE BLOCK *****
+   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
+   -
+   - The contents of this file are subject to the Mozilla Public License Version
+   - 1.1 (the "License"); you may not use this file except in compliance with
+   - the License. You may obtain a copy of the License at
+   - http://www.mozilla.org/MPL/
+   -
+   - Software distributed under the License is distributed on an "AS IS" basis,
+   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+   - for the specific language governing rights and limitations under the
+   - License.
+   -
+   - The Original Code is Sun Microsystems code.
+   -
+   - The Initial Developer of the Original Code is
+   -   Philipp Kewisch <mozilla@kewis.ch>
+   - Portions created by the Initial Developer are Copyright (C) 2008
+   - the Initial Developer. All Rights Reserved.
+   -
+   - Contributor(s):
+   -
+   - Alternatively, the contents of this file may be used under the terms of
+   - either the GNU General Public License Version 2 or later (the "GPL"), or
+   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+   - in which case the provisions of the GPL or the LGPL are applicable instead
+   - of those above. If you wish to allow use of your version of this file only
+   - under the terms of either the GPL or the LGPL, and not to allow others to
+   - use your version of this file under the terms of the MPL, indicate your
+   - decision by deleting the provisions above and replace them with the notice
+   - and other provisions required by the LGPL or the GPL. If you do not delete
+   - the provisions above, a recipient may use your version of this file under
+   - the terms of any one of the MPL, the GPL or the LGPL.
+   -
+   - ***** END LICENSE BLOCK ***** -->
+
+<!ENTITY sunbird.choosedate.button.tooltip                 "Prejsť na dátum" >
+<!ENTITY sunbird.cut.button.tooltip                        "Vystrihnúť" >
+<!ENTITY sunbird.copy.button.tooltip                       "Kopírovať" >
+<!ENTITY sunbird.paste.button.tooltip                      "Prilepiť" >
+<!ENTITY sunbird.print.button.tooltip                      "Tlač kalendára" >
+<!ENTITY sunbird.delete.button.tooltip                     "Odstrániť označenú úlohu" >
+<!ENTITY sunbird.remotereload.button.tooltip               "Aktualizovať všetky vzdialené kalendáre" >
+
+<!ENTITY sunbird.choosedate.button.label                   "Vybrať dátum" >
+<!ENTITY sunbird.cut.button.label                          "Vystrihnúť" >
+<!ENTITY sunbird.copy.button.label                         "Kopírovať" >
+<!ENTITY sunbird.paste.button.label                        "Prilepiť" >
+<!ENTITY sunbird.delete.button.label                       "Odstrániť" >
+<!ENTITY sunbird.remotereload.button.label                 "Aktualizovať" >
+
+<!ENTITY sunbird.flat.topbar.choosedate                    "Prejsť na dátum" >
+<!ENTITY sunbird.flat.topbar.dayview                       "Denný pohľad" >
+<!ENTITY sunbird.flat.topbar.weekview                      "Týždenný pohľad" >
+<!ENTITY sunbird.flat.topbar.monthview                     "Mesačný pohľad" >
+<!ENTITY sunbird.flat.topbar.multiweekview                 "Viactýždenný pohľad" >
+
+<!ENTITY sunbird.dayview.accesskey                         "D" >
+<!ENTITY sunbird.weekview.accesskey                        "T" >
+<!ENTITY sunbird.monthview.accesskey                       "M" >
+<!ENTITY sunbird.multiweekview.accesskey                   "V" >
+
+
+<!ENTITY sunbird.calendartab.label                         "Dátum">
+<!ENTITY sunbird.listofcalendarstab.label                  "Kalendáre">
+
+<!ENTITY sunbird.find.key                                  "F">
+<!ENTITY sunbird.close.key                                 "W">
+
+<!ENTITY sunbird.menu.numberofweeks.label                  "Počet týždňov" >
+<!ENTITY sunbird.menu.numberofweeks.accesskey              "P" >
+<!ENTITY sunbird.menu.numberofweeks.2                      "2 týždne" >
+<!ENTITY sunbird.menu.numberofweeks.3                      "3 týždne" >
+<!ENTITY sunbird.menu.numberofweeks.4                      "4 týždne" >
+<!ENTITY sunbird.menu.numberofweeks.5                      "5 týždňov" >
+<!ENTITY sunbird.menu.numberofweeks.6                      "6 týždňov" >
+
+<!-- customizable toolbars -->
+<!ENTITY sunbird.context.customize.label                   "Prispôsobiť…">
+<!ENTITY sunbird.context.customize.accesskey               "P">
+<!ENTITY sunbird.menu.customize.label                      "Prispôsobiť panel nástrojov…">
+<!ENTITY sunbird.menu.customize.accesskey                  "P">
+<!ENTITY sunbird.maintoolbar.name                          "Hlavný panel nástrojov">
+<!ENTITY sunbird.maintoolbar.accesskey                     "H">
+
+<!-- Sunbird Help -->
+<!ENTITY sunbird.help.label                                "Obsah pomocníka">
+<!ENTITY sunbird.help.accesskey                            "O">
+
+<!-- LOCALIZATION NOTE (mainWindow.title): DONT_TRANSLATE -->
+<!ENTITY mainWindow.title                                  "&brandFullName;">
--- a/mail/chrome/communicator/utilityOverlay.dtd
+++ b/mail/chrome/communicator/utilityOverlay.dtd
@@ -20,49 +20,35 @@
 <!ENTITY cutCmd.accesskey "V">
 <!ENTITY copyCmd.label "Kopírovať">
 <!ENTITY copyCmd.key "C">
 <!ENTITY copyCmd.accesskey "K">
 <!ENTITY pasteCmd.label "Prilepiť">
 <!ENTITY pasteCmd.key "V">
 <!ENTITY pasteCmd.accesskey "P">
 <!ENTITY deleteCmd.label "Odstrániť">
-<!ENTITY deleteCmd.key "D">
 <!ENTITY deleteCmd.accesskey "O">
 <!ENTITY selectAllCmd.label "Vybrať všetko">
 <!ENTITY selectAllCmd.key "A">
 <!ENTITY selectAllCmd.accesskey "a">
 <!ENTITY preferencesCmd.label "Možnosti…">
 <!ENTITY preferencesCmd.accesskey "M">
 <!ENTITY preferencesCmdUnix.label "Možnosti">
 <!ENTITY preferencesCmdUnix.accesskey "M">
 
-<!ENTITY findTypeTextCmd.label "Hľadať počas písania text na stránke">
-<!ENTITY findTypeTextCmd.accesskey "x">
-
 <!ENTITY viewMenu.label "Zobraziť">
 <!ENTITY viewMenu.accesskey "Z">
 <!ENTITY viewToolbarsMenu.label "Panely s nástrojmi">
 <!ENTITY viewToolbarsMenu.accesskey "P">
 <!ENTITY showTaskbarCmd.label "Stavový riadok">
 <!ENTITY showTaskbarCmd.accesskey "S">
 
-<!ENTITY direct.label "Online (proxy: žiadne)">
-<!ENTITY direct.accesskey "n">
-<!ENTITY manual.label "Online (proxy: ručné)">
-<!ENTITY manual.accesskey "r">
-<!ENTITY pac.label "Online (proxy: automatické)">
-<!ENTITY pac.accesskey "a">
-
 <!ENTITY proxy.label "Nastavenie proxy…">
 <!ENTITY proxy.accesskey "N">
 
-<!ENTITY findTypeTextCmd.key "/">
-<!ENTITY findTypeLinksCmd.key "'">
-
 <!ENTITY closeCmd.label "Zavrieť">
 <!ENTITY closeCmd.key "W">
 <!ENTITY closeCmd.accesskey "Z">
 
 <!ENTITY closeWindow.label "Zavrieť okno">
 
 <!ENTITY quitApplicationCmd.label "Koniec">
 <!ENTITY quitApplicationCmd.key "Q">
--- a/mail/chrome/messenger-newsblog/am-newsblog.dtd
+++ b/mail/chrome/messenger-newsblog/am-newsblog.dtd
@@ -13,9 +13,8 @@
 <!ENTITY manageSubscriptions.label "Správa odoberania…">
 <!ENTITY manageSubscriptions.accesskey "S">
 
 <!-- entities from defaults/isp/rss.rdf -->
 <!ENTITY rss.accountName "Kanály RSS">
 <!ENTITY rss.wizardShortName "RSS">  
 <!ENTITY rss.wizardLongName "Účet pre kanály RSS">
 <!ENTITY rss.wizardLongName.accesskey "R">
-<!ENTITY rss.hostName "Kanály RSS"> 
--- a/mail/chrome/messenger-smime/msgCompSMIMEOverlay.dtd
+++ b/mail/chrome/messenger-smime/msgCompSMIMEOverlay.dtd
@@ -1,16 +1,13 @@
 <!--LOCALIZATION NOTE msgCompSMIMEOverlay.dtd UI for s/mime hooks in message composition -->
 
 <!ENTITY securityMenu.label "Bezpečnosť">
 <!ENTITY securityMenu.accesskey "B">
 
-<!ENTITY menu_securityEncryptIfPossible.label "Zašifrovať, ak je to možné ">
-<!ENTITY menu_securityEncryptIfPossible.accesskey "f">
-
 <!ENTITY menu_securityEncryptRequire.label "Zašifrovať túto správu">
 <!ENTITY menu_securityEncryptRequire.accesskey "Z">
 
 <!ENTITY menu_securityNoEncryption.label "Nešifrovať túto správu">
 <!ENTITY menu_securityNoEncryption.accesskey "N">
 
 <!ENTITY menu_securitySign.label "Digitálne podpísať túto správu">
 <!ENTITY menu_securitySign.accesskey "D">
--- a/mail/chrome/messenger/AccountManager.dtd
+++ b/mail/chrome/messenger/AccountManager.dtd
@@ -1,23 +1,19 @@
 <!-- extracted from AccountManager.xul -->
 
 <!ENTITY accountManagerTitle.label "Nastavenie účtov">
 
 <!ENTITY addAccountButton.label "Pridať účet…">
 <!ENTITY addAccountButton.accesskey "P">
 <!ENTITY setDefaultButton.label "Nastaviť ako predvolený">
 <!ENTITY setDefaultButton.accesskey "N">
-<!ENTITY duplicateButton.label "Duplikovať">
 <!ENTITY removeButton.label "Odstrániť účet">
 <!ENTITY removeButton.accesskey "O">
 
-<!ENTITY nameCol.label "Názov">
-<!ENTITY duplicate.label "Duplikovať">
-
 <!-- AccountManager.xul -->
 <!-- LOCALIZATION NOTE : this is part of an inline-style attribute on the account
      setting dialog, which specifies the width and height in em units of the dialog.
      Localizers ONLY can increase these widths if they are having difficulty getting
      panel content to fit. 1em = the width of the letter 'm' in the selected font.
      XUL/FE DEVELOPERS: DO NOT MODIFY THIS VALUE. It represents the correct size of
      this window for en-US. -->
 <!ENTITY accountManager.size "width: 71em; height: 50em;">
--- a/mail/chrome/messenger/AccountWizard.dtd
+++ b/mail/chrome/messenger/AccountWizard.dtd
@@ -25,52 +25,40 @@
 	2, Use localized full name instead of "John Smith"
 -->
 <!ENTITY fullnameExample.label "(napr. &quot;Janko Mrkvička&quot;).">
 <!ENTITY fullnameLabel.label "Vaše meno:">
 <!ENTITY fullnameLabel.accesskey "V">
 
 <!ENTITY emailLabel.label "E-mailová adresa:">
 <!ENTITY emailLabel.accesskey "E">
-<!ENTITY emailDesc.label "Zadajte vašu e-mailovú adresu. Túto adresu budú ostatní používať pre odosielanie správ vám">
-<!-- LOCALIZATION NOTE (emailExample.label) : do not translate "user@example.net" in below line -->
-<!ENTITY emailExample.label "(napr. pouzivatel@priklad.sk).">
 
 <!-- Entities for Server page -->
 
 <!ENTITY serverTitle.label "Informácie o serveri">
-<!ENTITY incomingServerTitle.label "Server pre príjem pošty">
 <!ENTITY incomingServerTypeDesc.label "Zvoľte typ servera pre príjem pošty.">
-<!ENTITY incomingServerTypeLabel.label "Typ servera:">
 <!-- LOCALIZATION NOTE (incomingServerNameDesc.label) : Do not translate "&quot;pop.example.net&quot;" in below line -->
 <!ENTITY incomingServerNameDesc.label "Zadajte názov vášho servera pre prichádzajúcu poštu (napr. &quot;mail.firma.sk&quot;).">
 <!ENTITY incomingServerLabel.label "Server pre príjem pošty:">
 <!ENTITY incomingServerLabel.accesskey "S">
 <!-- LOCALIZATION NOTE (newsServerNameDesc.label) : Do not translate "NNTP" or the "&quot;" entities in below line -->
 <!ENTITY newsServerNameDesc.label "Zadajte názov vášho diskusného (NNTP) servera (napríklad &quot;news.example.net&quot;).">
-<!-- LOCALIZATION NOTE (smtpServerTitle.label) : Do not translate "SMTP" in below line -->
-<!ENTITY smtpServerTitle.label "Server pre odosielanie pošty (SMTP)">
 <!-- LOCALIZATION NOTE (smtpServerDesc.label) : Do not translate "SMTP" and "&quot;smtp.example.net&quot;" in below line -->
 <!ENTITY smtpServerDesc.label "Zadajte názov vášho servera pre odosielanie pošty (SMTP) (napríklad &quot;smtp.priklad.sk&quot;).">
 <!ENTITY smtpServerLabel.label "Server pre odosielanie pošty:">
 <!ENTITY smtpServerLabel.accesskey "o">
 <!ENTITY newsServerLabel.label "Server diskusných skupín:">
 <!ENTITY newsServerLabel.accesskey "S">
 <!-- LOCALIZATION NOTE (imapType.label) : Do not translate "IMAP" in below line -->
 <!ENTITY imapType.label "IMAP">
 <!ENTITY imapType.accesskey "I">
 <!-- LOCALIZATION NOTE (popType.label) : Do not translate "POP" in below line -->
 <!ENTITY popType.label "POP">
 <!ENTITY popType.accesskey "P">
-<!ENTITY nntpType.label "Diskusný server">
-<!-- for when the user has an SMTP server pre-configured -->
-<!-- LOCALIZATION NOTE (currentSmtpBefore.label) : Do not translate "SMTP" and "&quot;" in
-     this variable. Also, translate currentSmtpBefore.label and currentSmtpAfter.label as a single sentence,
-	  inserting text after the "&quot;" entity in currentSmtpAfter.label, if required grammatically
--->
+
 <!-- LOCALIZATION NOTE (haveSmtp1.prefix and haveSmtp1.suffix) : Do not translate "SMTP" and "&quot;" in
      these variables. Also, translate haveSmtp1.prefix and haveSmtp1.suffix as a single sentence, inserting
      text after the "&quot;" entity in haveSmtp1.suffix, if required grammatically.
 -->
 <!ENTITY haveSmtp1.prefix "Pre odosielanie pošty bude použitý váš aktuálne nastavený server SMTP, &quot;">
 <!ENTITY haveSmtp1.suffix "&quot;. Nastavenie servera pre odosielanie pošty môžete upraviť cez položku Nastavenie účtov v ponuke Nástroje.">
 
 <!-- Entities for Login page -->
@@ -97,19 +85,18 @@
 <!ENTITY haveSmtp3.prefix "Váš server pre odosielanie pošty, &quot;">
 <!ENTITY haveSmtp3.suffix "&quot;, je zhodný s vašim serverom pre príjem pošty. Používateľské meno pre príjem pošty sa použije aj pri odosielaní pošty. Nastavenie servera pre odosielanie pošty môžete upraviť cez položku Nastavenie účtov v ponuke Nástroje.">
 
 <!-- Entities for Account name page -->
 
 <!ENTITY accnameTitle.label "Názov účtu">
 <!-- LOCALIZATION NOTE (accnameDesc.label) : do not translate any "&quot;" in below line -->
 <!ENTITY accnameDesc.label "Zadajte názov tohto účtu (napr. &quot;Osobná pošta&quot;, &quot;Práca&quot;, &quot;Diskusia&quot;…).">
-<!ENTITY accnameExample.label "Napríklad Domáci účet, Pracovný účet alebo Diskusný účet">
 <!ENTITY accnameLabel.label "Názov účtu:">
-<!ENTITY accnameLabel.accesskey "N">
+<!ENTITY accnameLabel.accesskey "z">
 
 <!-- Entities for Done (Congratulations) page -->
 
 <!ENTITY completionTitle.label "Gratulujeme!">
 <!ENTITY completionText.label "Skontrolujte správnosť nasledujúcich informácií.">
 <!ENTITY serverTypePrefix.label "Typ servera pre príjem pošty:">
 <!ENTITY serverNamePrefix.label "Názov servera pre príjem pošty:">
 <!ENTITY smtpServerNamePrefix.label "Názov servera pre odosielanie pošty (SMTP):">
--- a/mail/chrome/messenger/FilterEditor.dtd
+++ b/mail/chrome/messenger/FilterEditor.dtd
@@ -15,19 +15,16 @@
 <!ENTITY contextDesc.label "Filter použiť pri:">
 <!ENTITY contextDesc.accesskey "F">
 <!ENTITY contextIncoming.label "kontrole pošty">
 <!ENTITY contextManual.label "manuálnom spustení">
 <!ENTITY contextBoth.label "kontrole pošty alebo manuálnom spustení">
 <!ENTITY filterActionDesc.label "Vykonať tieto akcie:">
 <!ENTITY filterActionDesc.accesskey "V">
 
-<!ENTITY newFolderButton.label "Nový priečinok…">
-<!ENTITY newFolderButton.accesskey "N">
-
 <!-- New Style Filter Rule Actions -->
 <!ENTITY moveMessage.label "Presunúť do priečinka">
 <!ENTITY copyMessage.label "Kopírovať do priečinka">
 <!ENTITY forwardTo.label "Odoslať ďalej komu">
 <!ENTITY replyWithTemplate.label "Odpovedať pomocou šablóny">
 <!ENTITY markMessageRead.label "Označiť ako prečítané">
 <!ENTITY markMessageStarred.label "Pridať hviezdičku">
 <!ENTITY setPriority.label "Zmeniť prioritu na">
--- a/mail/chrome/messenger/SearchDialog.dtd
+++ b/mail/chrome/messenger/SearchDialog.dtd
@@ -1,24 +1,20 @@
 <!-- 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 resetButton.label           "Obnoviť">
 <!ENTITY resetButton.accesskey       "b">
-<!ENTITY optionsButton.label         "Možnosti">
-<!ENTITY closeButton.label           "Zavrieť">
 <!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 conditionDesc.label         "Hľadať správy, ktoré:">
-<!ENTITY conditions.label            "Kritéria">
 <!ENTITY results.label               "Výsledky">
 <!ENTITY fileHereMenu.label          "Uložiť sem">
 <!ENTITY fileHereMenu.accesskey      "U">
 <!ENTITY fileButton.label            "Uložiť">
 <!ENTITY fileButton.accesskey        "U">
 <!ENTITY closeCmd.key                "W">
 <!ENTITY goToFolderButton.label      "Otvoriť priečinok správy">
 <!ENTITY goToFolderButton.accesskey  "O">
@@ -41,17 +37,16 @@
 <!ENTITY subjectColumn.label         "Predmet">
 <!ENTITY dateColumn.label            "Dátum">
 <!ENTITY priorityColumn.label        "Priorita">
 <!ENTITY tagsColumn.label            "Popis">
 <!ENTITY accountColumn.label         "Účet">
 <!ENTITY statusColumn.label          "Stav">
 <!ENTITY sizeColumn.label            "Veľkosť">
 <!ENTITY junkStatusColumn.label      "Spam">
-<!ENTITY linesColumn.label           "Riadky">
 <!ENTITY unreadColumn.label          "Neprečítané">
 <!ENTITY totalColumn.label           "Celkovo">
 <!ENTITY readColumn.label            "Prečítané">
 <!ENTITY receivedColumn.label        "Prijaté">
 <!ENTITY starredColumn.label         "Hviezdička">
 <!ENTITY locationColumn.label        "Umiestnenie">
 <!ENTITY idColumn.label              "Poradie prijatia">
 
--- a/mail/chrome/messenger/addressbook/abMailListDialog.dtd
+++ b/mail/chrome/messenger/addressbook/abMailListDialog.dtd
@@ -40,16 +40,15 @@
 <!-- Labels -->
 <!ENTITY addToAddressBook.label     "Pridať do:">
 
 <!ENTITY ListName.label             "Názov zoznamu:">
 <!ENTITY ListNickName.label         "Prezývka zoznamu:">
 <!ENTITY ListDescription.label      "Popis:">
 <!-- See bug 58485, when we implement drag and drop, add 'or drag addresses' back in -->
 <!ENTITY AddressTitle.label         "Napíšte e-mailové adresy, ktoré chcete pridať do rozosielacieho zoznamu:">
-<!ENTITY RemoveButton.label         "Odstrániť">
 <!ENTITY UpButton.label             "Posunúť nahor">
 <!ENTITY DownButton.label           "Posunúť nadol">
 <!-- Access Keys -->
 <!ENTITY addToAddressBook.accesskey "P">
 <!ENTITY ListName.accesskey         "N">
 <!ENTITY ListNickName.accesskey     "r">
 <!ENTITY ListDescription.accesskey  "o">
--- a/mail/chrome/messenger/addressbook/abMainWindow.dtd
+++ b/mail/chrome/messenger/addressbook/abMainWindow.dtd
@@ -55,17 +55,16 @@
 <!ENTITY cutCmd.accesskey                               "V">
 <!ENTITY copyCmd.label                                  "Kopírovať">
 <!ENTITY copyCmd.key                                    "C">
 <!ENTITY copyCmd.accesskey                              "K">
 <!ENTITY pasteCmd.label                                 "Prilepiť">
 <!ENTITY pasteCmd.key                                   "V">
 <!ENTITY pasteCmd.accesskey                             "P">
 <!ENTITY deleteCmd.label                                "Odstrániť">
-<!ENTITY deleteCmd.key                                  "D">
 <!ENTITY deleteCmd.accesskey                            "O">
 <!ENTITY deleteAbCmd.label                              "Odstrániť adresár">
 <!ENTITY deleteCardCmd.label                            "Odstrániť kartu">
 <!ENTITY deleteCardsCmd2.label                          "Odstrániť karty">
 <!ENTITY deleteListCmd.label                            "Odstrániť zoznam">
 <!ENTITY deleteListsCmd.label                           "Odstrániť zoznamy">
 <!ENTITY deleteItemsCmd.label                           "Odstrániť položky">
 <!ENTITY selectAllCmd.label                             "Vybrať všetko">
@@ -113,17 +112,16 @@
 <!ENTITY messengerCmd.commandkey                        "1">
 <!ENTITY searchAddressesCmd.label                       "Hľadať adresy…">
 <!ENTITY searchAddressesCmd.accesskey                   "H">
 <!ENTITY importCmd.label                                "Import…">
 <!ENTITY importCmd.accesskey                            "I">
 <!ENTITY exportCmd.label                                "Export…">
 <!ENTITY exportCmd.accesskey                            "E">
 <!ENTITY preferencesCmd.label                           "Možnosti…">
-<!ENTITY preferencesCmd.key                             "O">
 <!ENTITY preferencesCmd.accesskey                       "M">
 <!ENTITY preferencesCmdUnix.label                       "Možnosti">
 <!ENTITY preferencesCmdUnix.accesskey                   "M">
 
 <!-- Address Book Toolbar and Context Menus -->
 <!ENTITY newcardButton.label                            "Nová karta">
 <!ENTITY newcardButton.accesskey                        "k">
 <!ENTITY newlistButton.label                            "Nový zoznam">
--- a/mail/chrome/messenger/addressbook/pref-directory-add.dtd
+++ b/mail/chrome/messenger/addressbook/pref-directory-add.dtd
@@ -43,22 +43,19 @@
 <!ENTITY directoryBaseDN.label             "Základné DN:">
 <!ENTITY directoryBaseDN.accesskey         "Z">
 <!ENTITY findButton.label                  "Hľadať">
 <!ENTITY findButton.accesskey              "H">
 <!ENTITY directorySecure.label             "Používať zabezpečené pripojenie (SSL)">
 <!ENTITY directorySecure.accesskey         "P">
 <!ENTITY directoryLogin.label              "DN pripájania:">
 <!ENTITY directoryLogin.accesskey          "D">
-<!ENTITY advancedOptionsButton.label       "Pokročilé možnosti">
-<!ENTITY advancedOptionsButton.accesskey   "m">
 <!ENTITY General.tab                       "Všeobecné">
 <!ENTITY Offline.tab                       "Režim offline">
 <!ENTITY Advanced.tab                      "Pokročilé">
-<!ENTITY advancedOptionsTitle.label        "Pokročilé možnosti">
 <!ENTITY portNumber.label                  "Číslo portu:">
 <!ENTITY portNumber.accesskey              "r">
 <!ENTITY searchFilter.label                "Prehľadávací filter:">
 <!ENTITY searchFilter.accesskey            "P">
 <!ENTITY scope.label                       "Rozsah:">
 <!ENTITY scope.accesskey                   "R">
 <!ENTITY scopeOneLevel.label               "Jedna úroveň">
 <!ENTITY scopeOneLevel.accesskey           "J">
--- a/mail/chrome/messenger/addressbook/pref-directory.dtd
+++ b/mail/chrome/messenger/addressbook/pref-directory.dtd
@@ -31,22 +31,19 @@
  decision by deleting the provisions above and replace them with the notice
  and other provisions required by the GPL or the LGPL. If you do not delete
  the provisions above, a recipient may use your version of this file under
  the terms of any one of the MPL, the GPL or the LGPL.
 
  ***** END LICENSE BLOCK ***** -->
 <!-- LOCALIZATION NOTE (window.title) : do not translate "LDAP" in below line -->
 <!ENTITY pref.ldap.window.title    "Adresárové servery LDAP">
-<!ENTITY directory.label           "Pridať adresár">
 <!-- LOCALIZATION NOTE (directories.label) : do not translate "LDAP" in below line -->
 <!ENTITY directories.label         "Adresárový server LDAP:">
 <!-- LOCALIZATION NOTE (directoriesText.label) : do not translate "LDAP" in below line -->
 <!ENTITY directoriesText.label     "Vyberte adresárový server LDAP:">
 <!ENTITY directoriesText.accesskey "V">
-<!-- LOCALIZATION NOTE (autocomplete.title) : do not translate "LDAP" in below line -->
-<!ENTITY autocomplete.title        "Adresárový server LDAP">
 <!ENTITY addDirectory.label        "Pridať">
 <!ENTITY addDirectory.accesskey    "P">
 <!ENTITY editDirectory.label       "Upraviť">
 <!ENTITY editDirectory.accesskey   "U">
 <!ENTITY deleteDirectory.label     "Odstrániť">
 <!ENTITY deleteDirectory.accesskey "O">
--- a/mail/chrome/messenger/am-copies.dtd
+++ b/mail/chrome/messenger/am-copies.dtd
@@ -1,23 +1,19 @@
 <!-- extracted from am-copies.xul -->
 
 <!ENTITY copyAndFolderTitle.label "Kópie a priečinky">
 <!ENTITY sendingPrefix.label "Pri odosielaní správ automaticky:">
 <!ENTITY fccMailFolder.label "Uložiť kópiu do:">
 <!ENTITY fccMailFolder.accesskey "U">
 <!ENTITY fccReplyFollowsParent.label "Umiestniť odpovede v priečinku, v ktorom sa nachádza pôvodná správa">
 <!ENTITY fccReplyFollowsParent.accesskey "m">
-<!ENTITY chooseFolderButton.label "Vybrať priečinok:">
 <!-- LOCALIZATION NOTE (bccAddress.label): do not translate "Bcc" in below line -->
 <!ENTITY bccAddress.label 'Odoslať Skrytú kópiu (BCC) na tieto adresy:'>
 <!ENTITY bccAddress.accesskey "S">
-<!ENTITY specialFolderTitle.label "Špeciálne priečinky">
-<!ENTITY draftMailFolder.label "Návrhy správ ukladať do:">
-<!ENTITY templateMailFolder.label "Šablóny správ ukladať do:">
 <!ENTITY saveMessageDlg.label "Pri ukladaní správ zobraziť dialógové okno s potvrdením">
 <!ENTITY saveMessageDlg.accesskey "b">
 <!-- LOCALIZATION NOTE (sentFolderOn.label): OK to translate this, bug #57440 -->
 <!ENTITY sentFolderOn.label "priečinok &quot;Odoslaná pošta&quot; v účte:">
 <!ENTITY sentFolderOn.accesskey "k">
 <!ENTITY sentInOtherFolder.label "inde:">
 <!ENTITY sentInOtherFolder.accesskey "i">
 <!-- LOCALIZATION NOTE (draftsFolderOn.label): OK to translate this, bug #57440 -->
--- a/mail/chrome/messenger/am-identities-list.dtd
+++ b/mail/chrome/messenger/am-identities-list.dtd
@@ -1,8 +1,7 @@
-<!ENTITY identitiesListTitle.label "Identity priradené k tomuto účtu">
 <!ENTITY identitiesListDesc.label "Správca viacnásobnej identity">
 <!ENTITY identitiesListAdd.label "Pridať…">
 <!ENTITY identitiesListAdd.accesskey "P">
 <!ENTITY identitiesListEdit.label "Upraviť…">
 <!ENTITY identitiesListEdit.accesskey "U">
 <!ENTITY identitiesListDelete.label "Odstrániť">
 <!ENTITY identitiesListDelete.accesskey "O">
--- a/mail/chrome/messenger/am-main.dtd
+++ b/mail/chrome/messenger/am-main.dtd
@@ -1,14 +1,13 @@
 <!-- extracted from am-main.xul -->
 
 <!ENTITY accountTitle.label "Nastavenie účtu">
 <!ENTITY accountName.label "Názov účtu:">
 <!ENTITY accountName.accesskey "z">
-<!ENTITY accountNameDesc.label "Názov účtu identifikuje každý účet">
 <!ENTITY identityTitle.label "Predvolená identita">
 <!ENTITY identityDesc.label "Každý účet má vlastnú identitu, čo sú vlastne informácie o vás, ktoré uvidia príjemcovia vašich správ.">
 <!ENTITY name.label "Vaše meno:">
 <!ENTITY name.accesskey "V">
 <!ENTITY email.label "E-mailová adresa:">
 <!ENTITY email.accesskey "E">
 <!ENTITY replyTo.label "Kam odpovedať:">
 <!ENTITY replyTo.accesskey "K">
--- a/mail/chrome/messenger/am-offline.dtd
+++ b/mail/chrome/messenger/am-offline.dtd
@@ -1,16 +1,15 @@
 <!ENTITY doNotDownloadPop3Movemail.label "Kvôli úspore miesta na disku nepreberať:">
 <!ENTITY doNotDownload.label "Kvôli úspore miesta na disku nepreberať pre použitie v režime offline:">
 <!ENTITY allFoldersOffline.label "Ponechať správy tohto účtu v tomto počítači">
 <!ENTITY allFoldersOffline.accesskey "c">
 <!ENTITY offlineNotDownload.label "Správy väčšie ako ">
 <!ENTITY offlineNotDownload.accesskey "S">
 <!ENTITY kb.label "kB">
-<!ENTITY days.label "dní">
 <!ENTITY daysOld.label "dní">
 <!ENTITY message.label "správ">
 <!ENTITY nntpNotDownloadRead.label "Prečítané správy">
 <!ENTITY nntpNotDownloadRead.accesskey "e">
 <!ENTITY nntpDownloadMsg.label "Správy staršie ako">
 <!ENTITY nntpDownloadMsg.accesskey "v">
 <!ENTITY retentionCleanup.label "Ak chcete získať miesto na disku, je možné staré správy automaticky odstraňovať.">
 <!ENTITY retentionKeepMsg.label "Odstrániť správy staršie ako">
--- a/mail/chrome/messenger/am-server-advanced.dtd
+++ b/mail/chrome/messenger/am-server-advanced.dtd
@@ -1,11 +1,9 @@
 <!ENTITY serverAdvanced.label                "Pokročilé nastavenia účtu">
-<!-- LOCALIZATION NOTE (imapAdvanced.label): Do not translate "IMAP" -->
-<!ENTITY imapAdvanced.label                  "Pokročilé nastavenie servera IMAP">
 <!-- LOCALIZATION NOTE (serverDirectory.label): Do not translate "IMAP" -->
 <!ENTITY serverDirectory.label               "Priečinok na serveri IMAP:">
 <!ENTITY serverDirectory.accesskey           "e">
 <!ENTITY usingSubscription.label             "Zobrazovať len prihlásené priečinky">
 <!ENTITY usingSubscription.accesskey         "b">
 <!ENTITY dualUseFolders.label                "Server podporuje priečinky obsahujúce správy a podpriečinky">
 <!ENTITY dualUseFolders.accesskey            "S">
 <!ENTITY useIdle.label                       "Použiť príkaz IDLE, ak ho server podporuje">
@@ -18,17 +16,16 @@
 <!ENTITY personalNamespace.accesskey         "n">
 <!ENTITY publicNamespace.label               "Verejný (zdieľaný):">
 <!ENTITY publicNamespace.accesskey           "V">
 <!ENTITY otherUsersNamespace.label           "Ostatní používatelia:">
 <!ENTITY otherUsersNamespace.accesskey       "a">
 <!ENTITY overrideNamespaces.label            "Povoliť serveru použiť vlastné priestory">
 <!ENTITY overrideNamespaces.accesskey        "u">
 <!ENTITY pop3Desc.label                      "Pri preberaní novej pošty z tohto servera POP použiť na ukladanie nasledujúci priečinok:">
-<!ENTITY folderStorage.label                 "Kam ukladať poštu">
 <!ENTITY globalInbox.label                   "Globálne doručená pošta">
 <!ENTITY globalInbox.accesskey               "G">
 <!ENTITY accountDirectory.label              "Doručená pošta pre tento účet">
 <!ENTITY accountDirectory.accesskey          "D">
 <!ENTITY deferToServer.label                 "Doručená pošta pre iný účet">
 <!ENTITY deferToServer.accesskey             "r">
 <!ENTITY deferGetNewMail.label               "Zahrnúť tento server pri preberaní novej pošty">
 <!ENTITY deferGetNewMail.accesskey           "Z">
--- a/mail/chrome/messenger/am-server-top.dtd
+++ b/mail/chrome/messenger/am-server-top.dtd
@@ -1,19 +1,12 @@
 <!-- extracted from am-server-top.xul -->
 
 <!ENTITY securitySettings.label "Bezpečnostné nastavenia">
 <!ENTITY serverSettings.label "Nastavenie servera">
-<!-- LOCALIZATION NOTE (popServer.label) : do not translate "POP" in below line -->
-<!ENTITY popServer.label "Poštový server typu POP">
-<!-- LOCALIZATION NOTE (imapServer.label) : do not translate "IMAP" in below line -->
-<!ENTITY imapServer.label "Poštový server typu IMAP">
-<!-- LOCALIZATION NOTE (newsServer.label) : do not translate "NNTP" in below line -->
-<!ENTITY newsServer.label "Server pre diskusné skupiny">
-<!ENTITY webmail.label "Webový e-mailový server">
 <!ENTITY serverType.label "Typ servera:">
 <!ENTITY serverName.label "Názov servera:">
 <!ENTITY serverName.accesskey "z">
 <!ENTITY userName.label "Používateľské meno:">
 <!ENTITY userName.accesskey "m">
 <!ENTITY port.label "Port:">
 <!ENTITY port.accesskey "r">
 <!ENTITY serverPortDefault.label "Štandardný:">
@@ -45,20 +38,17 @@
 <!ENTITY headersOnly.accesskey "a">
 <!ENTITY deleteByAgeFromServer.label "najviac">
 <!ENTITY deleteByAgeFromServer.accesskey "j">
 <!ENTITY daysEnd.label "dní">
 <!ENTITY deleteOnServer2.label "až kým nebudú odstránené">
 <!ENTITY deleteOnServer2.accesskey "b">
 <!ENTITY downloadOnBiff.label "Automaticky prevziať novú poštu">
 <!ENTITY downloadOnBiff.accesskey "y">
-<!ENTITY hostname.label "Názov počítača:">
 <!ENTITY username.label "Názov účtu">
-<!-- LOCALIZATION NOTE (popServerTitle.label) : do not translate "POP" in below line -->
-<!ENTITY popServerTitle.label "Informácie o serveri POP">
 <!ENTITY deleteMessagePrefix.label "Pri odstránení správy:">
 <!ENTITY modelMoveToTrash.label "Presunúť ju do priečinka:">
 <!ENTITY modelMoveToTrash.accesskey "j">
 <!ENTITY modelMarkDeleted.label "Iba ju označiť ako odstránenú">
 <!ENTITY modelMarkDeleted.accesskey "b">
 <!ENTITY modelDeleteImmediately.label "Okamžite ju odstrániť">
 <!ENTITY modelDeleteImmediately.accesskey "a">
 <!-- LOCALIZATION NOTE (expungeOnExit.label) : do not translate two of "&quot;" in below line -->
--- a/mail/chrome/messenger/am-smime.dtd
+++ b/mail/chrome/messenger/am-smime.dtd
@@ -1,20 +1,18 @@
 <!ENTITY securityTitle.label           "Bezpečnosť">
 <!ENTITY securityHeading.label         "Ak chcete posielať a prijímať podpísané alebo šifrované správy, mali by ste zadať certifikát pre šifrovanie a certifikát pre digitálne podpisovanie.">
 <!ENTITY encryptionGroupTitle.label    "Šifrovanie">
 <!ENTITY encryptionChoiceLabel.label   "Prednastavené šifrovanie pri posielaní správ:">
 <!ENTITY neverEncrypt.label            "Nikdy (nepoužívať šifrovanie)">
 <!ENTITY alwaysEncryptMessage.label    "Vždy (neumožní odoslanie, ak všetci adresáti nemajú certifikát)">
 <!ENTITY encryptionCert.message        "Na šifrovanie a dešifrovanie správ posielaných vám používať tento osobný certifikát:">
-<!ENTITY encryptionCert.notselected    "Žiaden certifikát nie je zadaný">
 <!ENTITY certificate.button            "Vybrať…">
 <!ENTITY certificate_clear.button      "Vymazať">
 <!ENTITY signingGroupTitle.label       "Digitálne podpisovanie">
 <!ENTITY signMessage.label             "Digitálne podpisovať správy (predvolene)">
 <!ENTITY signingCert.message           "Na digitálne podpisovanie správ používať tento osobný certifikát:">
-<!ENTITY signingCert.notselected       "Nie je nastavený žiadny certifikát">
 
 <!ENTITY certificates.label            "Certifikáty">
 <!ENTITY managecerts.label             "Zobraziť certifikáty">
 <!ENTITY managecerts.accesskey         "Z">
 <!ENTITY managedevices.label           "Bezpečnostné zariadenia">
 <!ENTITY managedevices.accesskey       "B">
--- a/mail/chrome/messenger/credits.dtd
+++ b/mail/chrome/messenger/credits.dtd
@@ -1,30 +1,17 @@
 <!ENTITY credit.title     "O programe &brandFullName;">
 <!ENTITY brandMotto       "Thunderbirds Are Go!">
 <!ENTITY credit.leads     "Hlavní inžinieri">
-<!ENTITY credit.core      "Hlavní vývojári">
-<!ENTITY credit.gecko     "Vykresľovacie jadro Gecko">
 <!ENTITY credit.thanks    "Špeciálne poďakovanie">
 
 <!-- localization credits look like this: -->
 <!--
 <!ENTITY credit.translation
   "<h3>Translators</h3><ul><li>Name Here</li></ul>">
 -->
 <!ENTITY credit.translation "<h3>Vedúci prekladu do slovenčiny</h3><ul><li>Branislav Rozbora</li></ul><h3>Preklady</h3><ul><li>Vlado Valaštiak (wladow)</li></ul><h3>Korektúry</h3><ul><li>Peter Mikšík (SlovakSoft)</li></ul><h3>Slovník pre kontrolu pravopisu</h3><ul><li>Zdenko Podobný</li></ul>">
 
-<!ENTITY credit.visuals     "Koordinátor vizuálneho návrhu">
 <!ENTITY credit.theme       "Návrh témy">
-<!ENTITY credit.brand       "Značka">
-<!ENTITY credit.web         "Web dizajn">
-<!ENTITY credit.update      "Aktualizácie">
-<!ENTITY credit.qalead      "Vedúci zaistenia kvality">
 <!ENTITY credit.qa          "Zaistenie kvality">
 <!ENTITY credit.build       "Vydanie">
-<!ENTITY credit.infra       "Podpora infraštruktúry">
-<!ENTITY credit.support     "Podporné zdroje">
-<!ENTITY credit.manage      "Vedenie projektu">
-<!ENTITY credit.marketleads "Vedúci marketingu">
-<!ENTITY credit.market      "Marketing">
-<!ENTITY credit.creators    "Vytvorené">
 <!ENTITY credit.memory      "V spomienke na">
 <!ENTITY credit.poweredByGecko "Poháňané jadrom Gecko&trade;">
deleted file mode 100644
--- a/mail/chrome/messenger/fieldMapExport.dtd
+++ /dev/null
@@ -1,41 +0,0 @@
-<!-- ***** BEGIN LICENSE BLOCK *****
- Version: MPL 1.1/GPL 2.0/LGPL 2.1
-
- The contents of this file are subject to the Mozilla Public License Version
- 1.1 (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
- http://www.mozilla.org/MPL/
-
- Software distributed under the License is distributed on an "AS IS" basis,
- WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- for the specific language governing rights and limitations under the
- License.
-
- The Original Code is Mozilla Communicator client code, released
- March 31, 1998.
-
- The Initial Developer of the Original Code is
- Netscape Communications Corporation.
- Portions created by the Initial Developer are Copyright (C) 1998-1999
- the Initial Developer. All Rights Reserved.
-
- Contributor(s):
-
- Alternatively, the contents of this file may be used under the terms of
- either the GNU General Public License Version 2 or later (the "GPL"), or
- the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- in which case the provisions of the GPL or the LGPL are applicable instead
- of those above. If you wish to allow use of your version of this file only
- under the terms of either the GPL or the LGPL, and not to allow others to
- use your version of this file under the terms of the MPL, indicate your
- decision by deleting the provisions above and replace them with the notice
- and other provisions required by the GPL or the LGPL. If you do not delete
- the provisions above, a recipient may use your version of this file under
- the terms of any one of the MPL, the GPL or the LGPL.
-
- ***** END LICENSE BLOCK ***** -->
-
-<!ENTITY fieldMapExport.title "Exportovať adresár">
-<!ENTITY fieldMapExport.add "Pridať položku ->">
-<!ENTITY fieldMapExport.addAll "Pridať všetky ->">
-<!ENTITY fieldList.label "Polia adries">
--- a/mail/chrome/messenger/folderProps.dtd
+++ b/mail/chrome/messenger/folderProps.dtd
@@ -47,17 +47,16 @@
 <!ENTITY folderCharsetOverride.accesskey        "P">
 <!ENTITY folderRebuildSummaryFile.label         "Preindexovať">
 <!ENTITY folderRebuildSummaryFile.accesskey     "x">
 <!ENTITY folderRebuildSummaryFileTip.label      "Vytvorí nový indexový súbor">    
 
 <!ENTITY retention.label                        "Pravidlá manipulácie so správami">
 <!ENTITY retentionUseDefault.label              "Použiť predvolené nastavenia servera">
 <!ENTITY retentionUseDefault.accesskey          "P">
-<!ENTITY days.label                             "dní">
 <!ENTITY daysOld.label                          "dní">
 <!ENTITY message.label                          "správ">
 <!ENTITY retentionCleanup.label                 "Automatickým odstraňovaním starých správ je možné získať miesto na disku.">
 <!ENTITY retentionDeleteMsg.label               "Odstrániť správy staršie ako">
 <!ENTITY retentionDeleteMsg.accesskey           "O">
 <!ENTITY retentionKeepAll.label                 "Neodstraňovať žiadne správy">
 <!ENTITY retentionKeepAll.accesskey             "N">
 <!ENTITY retentionKeepNew.label                 "Odstrániť všetko okrem posledných">
@@ -71,28 +70,25 @@
 
 <!ENTITY offlineFolder.check.label              "Používať tento priečinok offline">
 <!ENTITY offlineFolder.check.accesskey          "u">
 <!ENTITY offlineFolder.button.label             "Prevziať">
 <!ENTITY offlineFolder.button.accesskey         "P">
 
 <!ENTITY selectofflineNewsgroup.check.label     "Označiť túto diskusiu na použitie v režime offline">
 <!ENTITY selectofflineNewsgroup.check.accesskey "O">
-<!ENTITY UseDefaultofflineNewsgroup.check.label "Použiť štandardné nastavenie účtu">
 <!ENTITY offlineNewsgroup.button.label          "Prevziať">
 <!ENTITY offlineNewsgroup.button.accesskey      "P">
 
-<!ENTITY folderProps.information.label          "Informácia:">
 <!ENTITY folderProps.name.label                 "Názov:">
 <!ENTITY folderProps.name.accesskey             "N">
 <!ENTITY folderProps.location.label             "Umiestnenie:">                   
 <!ENTITY folderProps.location.accesskey         "U">                           
 
 <!ENTITY folderSharingTab.label                 "Zdieľanie">
-<!ENTITY privilegesDesc.label                   "Zdieľať tento a iné priečinky s používateľmi na sieti, zobraziť a nastaviť prístupové práva">
 <!ENTITY privileges.button.label                "Prístupové práva…">
 <!ENTITY privileges.button.accesskey            "P">
 <!ENTITY permissionsDesc.label                  "Máte nasledujúce prístupové práva:">
 <!ENTITY folderType.label                       "Typ priečinka:">
 
 <!ENTITY folderQuotaTab.label                   "Kvóta">
 <!ENTITY folderQuotaRoot.label                  "Hlavná kvóta:">
 <!ENTITY folderQuotaUsage.label                 "Využitie:">
--- a/mail/chrome/messenger/folderpane.dtd
+++ b/mail/chrome/messenger/folderpane.dtd
@@ -33,11 +33,8 @@
  the provisions above, a recipient may use your version of this file under
  the terms of any one of the MPL, the GPL or the LGPL.
 
  ***** END LICENSE BLOCK ***** -->
 <!ENTITY nameColumn.label "Názov">
 <!ENTITY unreadColumn.label "Neprečítané">
 <!ENTITY totalColumn.label "Celkovo">
 <!ENTITY folderSizeColumn.label "Veľkosť">
-<!ENTITY accounts.label "Účty">
-<!-- LOCALIZATION NOTE (accounts.img) : DONT_TRANSLATE -->
-<!ENTITY accounts.img "chrome://messenger/skin/local-mailhost.gif">
--- a/mail/chrome/messenger/messenger.dtd
+++ b/mail/chrome/messenger/messenger.dtd
@@ -1,24 +1,21 @@
 <!ENTITY messengerWindow.title "Pošta a diskusie">
 <!ENTITY titledefault.label "&brandFullName;">
 <!ENTITY titleSeparator.label " - ">
 
 <!-- File Menu -->
 <!ENTITY newFolderCmd.label "Priečinok…">
 <!ENTITY newFolderCmd.accesskey "P">
-<!ENTITY newTabCmd.label "Nová karta">
-<!ENTITY newTabCmd.accesskey "k">
 <!ENTITY closeTabCmd.label "Zavrieť kartu">
 <!ENTITY closeTabCmd.accesskey "e">
 <!ENTITY newVirtualFolderCmd.label "Priečinok hľadania…">
 <!ENTITY newVirtualFolderCmd.accesskey "h">
 <!ENTITY newAccountCmd.label "Účet…">
 <!ENTITY newAccountCmd.accesskey "e">
-<!ENTITY openMessageMenu.label "Otvoriť">
 <!ENTITY openMessageFileCmd.label "Otvoriť uložené správy…">
 <!ENTITY openMessageFileCmd.accesskey "O">
 <!ENTITY openAttachmentCmd.label "Prílohy">
 <!ENTITY openAttachmentCmd.accesskey "P">
 <!ENTITY saveAsMenu.label "Uložiť ako">
 <!ENTITY saveAsMenu.accesskey "U">
 <!ENTITY saveAsFileCmd.label "Súbor">
 <!ENTITY saveAsFileCmd.accesskey "S">
@@ -61,17 +58,16 @@
 <!ENTITY downloadSelectedCmd.accesskey "v">
 <!ENTITY downloadStarredCmd.label "Prijať správy s hviezdičkou">
 <!ENTITY downloadStarredCmd.accesskey "a">
 <!ENTITY printCmd.label "Tlačiť…">
 <!ENTITY printCmd.accesskey "T">
 <!ENTITY printCmd.key "p">
 <!ENTITY printPreviewCmd.label "Ukážka pred tlačou">
 <!ENTITY printPreviewCmd.accesskey "e">
-<!ENTITY printPreviewCmd.key "v">
 <!ENTITY printSetupCmd.label "Nastavenie tlače…">
 <!ENTITY printSetupCmd.accesskey "a">
 
 <!-- Edit Menu -->
 <!ENTITY deleteMsgCmd.label "Odstrániť správu">
 <!ENTITY deleteMsgCmd.accesskey "O">
 <!ENTITY undeleteMsgCmd.label "Obnoviť správu">
 <!ENTITY undeleteMsgCmd.accesskey "O">
@@ -125,18 +121,16 @@
 <!ENTITY messagePaneLayoutStyle.label "Rozmiestnenie">
 <!ENTITY messagePaneLayoutStyle.accesskey "R">
 <!ENTITY messagePaneClassic.label "Klasický pohľad">
 <!ENTITY messagePaneClassic.accesskey "c">
 <!ENTITY messagePaneWide.label "Široký pohľad">
 <!ENTITY messagePaneWide.accesskey "r">
 <!ENTITY messagePaneVertical.label "Zvislý pohľad">
 <!ENTITY messagePaneVertical.accesskey "v">
-<!ENTITY threadPaneWide.label "Podrobný zoznam">
-<!ENTITY threadPaneWide.accesskey "d">
 <!ENTITY showMessageCmd.label "Panel správy">
 <!ENTITY showMessageCmd.accesskey "a">
 
 <!ENTITY folderView.label "Priečinky">
 <!ENTITY folderView.accesskey "P">
 <!ENTITY allFolders.label "Všetky">
 <!ENTITY allFolders.accesskey "V">
 <!ENTITY unreadFolders.label "Neprečítané">
@@ -188,18 +182,16 @@
 <!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">
-<!ENTITY expandOrCollapseMenu.label "Rozbaliť/Zbaliť">
-<!ENTITY expandOrCollapseMenu.accesskey "b">
 <!ENTITY expandAllThreadsCmd.label "Rozbaliť všetky vlákna">
 <!ENTITY expandAllThreadsCmd.accesskey "e">
 <!ENTITY expandAllThreadsCmd.key "*">
 <!ENTITY collapseAllThreadsCmd.label "Zbaliť všetky vlákna">
 <!ENTITY collapseAllThreadsCmd.accesskey "Z">
 <!ENTITY collapseAllThreadsCmd.key "\">
 <!ENTITY unreadMsgsCmd.label "Neprečítané">
 <!ENTITY unreadMsgsCmd.accesskey "N">
@@ -253,19 +245,16 @@ you can use these alternative items. Oth
 <!ENTITY fullZoom.label                 "Lupa">
 <!ENTITY fullZoom.accesskey             "L">
 
 <!ENTITY pageSourceCmd.label "Zdrojový kód správy">
 <!ENTITY pageSourceCmd.accesskey "Z">
 <!ENTITY pageSourceCmd.key "u">
 
 <!-- Search Menu -->
-<!ENTITY searchMenu.label "Hľadať">
-<!ENTITY searchMenu.accesskey "H">
-
 <!ENTITY findMenu.label "Hľadať">
 <!ENTITY findMenu.accesskey "d">
 <!ENTITY findCmd.label "Hľadať v tejto správe…">
 <!ENTITY findCmd.accesskey "H">
 <!ENTITY findCmd.key "f">
 <!ENTITY findAgainCmd.label "Hľadať znova">
 <!ENTITY findAgainCmd.accesskey "d">
 <!ENTITY findAgainCmd.key "g">
@@ -337,24 +326,24 @@ you can use these alternative items. Oth
 <!ENTITY forwardAsInline.accesskey "S">
 <!ENTITY forwardAsAttachmentCmd.label "Príloha">
 <!ENTITY forwardAsAttachmentCmd.accesskey "P">
 <!ENTITY editMsgAsNewCmd.label "Upraviť správu ako novú">
 <!ENTITY editMsgAsNewCmd.accesskey "U">
 <!ENTITY editMsgAsNewCmd.key "e">
 <!ENTITY createFilter.label "Vytvoriť filter zo správy…">
 <!ENTITY createFilter.accesskey "f">
-<!ENTITY moveMsgMenu.label "Presunúť">
-<!ENTITY moveMsgMenu.accesskey "r">
+<!ENTITY moveMsgToMenu.label "Presunúť do">
+<!ENTITY moveMsgToMenu.accesskey "r">
 <!ENTITY moveCopyMsgRecentMenu.label "Naposledy použité">
 <!ENTITY moveCopyMsgRecentMenu.accesskey "N">
 <!ENTITY copyMessageLocation.label "Kopírovať adresu správy">
 <!ENTITY copyMessageLocation.accesskey "s">
-<!ENTITY copyMsgMenu.label "Skopírovať">
-<!ENTITY copyMsgMenu.accesskey "k">
+<!ENTITY copyMsgToMenu.label "Skopírovať do">
+<!ENTITY copyMsgToMenu.accesskey "k">
 <!ENTITY moveToFolderAgain.label "Znova presunúť">
 <!ENTITY moveToFolderAgain.accesskey "r">
 <!ENTITY moveToFolderAgainCmd.key "m">
 <!ENTITY killThreadMenu.label "Ignorovať vlákno">
 <!ENTITY killThreadMenu.accesskey "I">
 <!ENTITY killThreadMenu.key "k">
 <!ENTITY killSubthreadMenu.label "Ignorovať podvlákno">
 <!ENTITY killSubthreadMenu.accesskey "d">
@@ -378,18 +367,16 @@ you can use these alternative items. Oth
 <!ENTITY tagCmd7.key "7">
 <!ENTITY tagCmd8.key "8">
 <!ENTITY tagCmd9.key "9">
 <!ENTITY markMenu.label "Označiť">
 <!ENTITY markMenu.accesskey "z">
 <!ENTITY markAsReadCmd.label "Ako prečítanú">
 <!ENTITY markAsReadCmd.accesskey "r">
 <!ENTITY markAsReadCmd.key "m">
-<!ENTITY markAsUnreadCmd.label "Ako neprečítanú">
-<!ENTITY markAsUnreadCmd.accesskey "n">
 <!ENTITY markThreadAsReadCmd.label "Vlákno ako prečítané">
 <!ENTITY markThreadAsReadCmd.accesskey "t">
 <!ENTITY markThreadAsReadCmd.key "r">
 <!ENTITY markReadByDateCmd.label "Ako prečítanú podľa dátumu…">
 <!ENTITY markReadByDateCmd.accesskey "d">
 <!ENTITY markReadByDateCmd.key "c">
 <!ENTITY markAllReadCmd.label "Všetky ako prečítané">
 <!ENTITY markAllReadCmd.accesskey "a">
@@ -406,17 +393,16 @@ you can use these alternative items. Oth
 <!ENTITY recalculateJunkScoreCmd.label "Spustiť rozpoznávanie nevyžiadanej pošty">
 <!ENTITY recalculateJunkScoreCmd.accesskey "u">
 <!ENTITY openMessageWindowCmd.label "Otvoriť správu">
 <!ENTITY openMessageWindowCmd.accesskey "s">
 <!ENTITY openMessageWindowCmd.key "o">
 
 <!-- Windows Menu -->
 <!ENTITY windowMenu.label "Okno">
-<!ENTITY windowMenu.accesskey "O">
 
 <!-- Tools Menu -->
 <!ENTITY tasksMenu.label "Nástroje">
 <!ENTITY tasksMenu.accesskey "N">
 <!ENTITY addons.label "Doplnky">
 <!ENTITY addons.accesskey "D">
 <!ENTITY messengerCmd.label "Pošta a diskusie">
 <!ENTITY messengerCmd.accesskey "P">
@@ -451,29 +437,27 @@ you can use these alternative items. Oth
 <!ENTITY backButton1.label "Prejsť naspäť">
 <!ENTITY goForwardButton1.label "Prejsť dopredu">
 <!ENTITY deleteButton.label "Odstrániť">
 <!ENTITY undeleteButton.label "Zrušiť odstránenie">
 <!ENTITY markButton.label "Označiť">
 <!ENTITY printButton.label "Tlačiť">
 <!ENTITY stopButton.label "Zastaviť">
 <!ENTITY throbberItem.title "Indikátor činnosti">
-<!ENTITY updatesItem.title "Aktualizácie">
 <!ENTITY junkButton.label "Spam">
 <!ENTITY notJunkButton.label "Nie Spam">
 <!ENTITY addressBookButton.label "Adresár">
 <!ENTITY searchItem.title "Rýchle vyhľadávanie">
 <!ENTITY mailViewsToolbarItem.title "Zobrazenie e-mailov">
 <!ENTITY folderLocationToolbarItem.title "Umiestnenie priečinka">
 <!ENTITY tagButton.label "Popis">
 <!ENTITY compactButton.label "Vykonať údržbu">
 
 <!-- Mail Toolbar Tooltips-->
 <!ENTITY advancedButton.tooltip "Pokročilé hľadanie v správach">
-<!ENTITY clearButton.tooltip "Vymazať vyhľadávaciu podmienku a zobraziť všetky správy">
 <!ENTITY getMsgButton.tooltip "Prijať nové správy">
 <!ENTITY getAllNewMsgCmd.label "Prijať všetky nové správy">
 <!ENTITY getAllNewMsgCmd.accesskey "P">
 <!ENTITY getAllNewMsgCmd.key "t">
 <!ENTITY newMsgButton.tooltip "Napísať novú správu">
 <!ENTITY replyButton.tooltip "Odpovedať na správu">
 <!ENTITY replyAllButton.tooltip "Odpovedať odosielateľovi a všetkým adresátom">
 <!ENTITY forwardButton.tooltip "Odoslať označenú správu ďalej">
@@ -537,18 +521,16 @@ you can use these alternative items. Oth
 <!ENTITY folderContextFavoriteFolder.label "Priečinok Obľúbené">
 <!ENTITY folderContextFavoriteFolder.accesskey "b">
 <!ENTITY folderContextSettings.label "Nastavenie…">
 <!ENTITY folderContextSettings.accesskey "N">
 
 <!-- Search Bar -->
 <!ENTITY SearchNameOrEmail.label "Meno alebo Email obsahuje:">
 <!ENTITY SearchNameOrEmail.accesskey "M">
-<!ENTITY clearButton.label "Vymazať">
-<!ENTITY clearButton.accesskey "V">
 
 <!-- Quick Search Menu Bar -->
 <!ENTITY searchSubjectMenu.label "Predmet">
 <!ENTITY searchFromMenu.label "Od">
 <!ENTITY searchSubjectOrFromMenu.label "Predmet alebo Od">
 <!ENTITY searchRecipient.label "Komu alebo Kópia">
 <!ENTITY searchSubjectOrRecipientMenu.label "Predmet, Komu alebo Kópia">
 <!ENTITY searchMessageBody.label "Telo správy">
@@ -561,17 +543,16 @@ you can use these alternative items. Oth
 <!ENTITY subjectColumn.label "Predmet">
 <!ENTITY dateColumn.label "Dátum">
 <!ENTITY priorityColumn.label "Priorita">
 <!ENTITY tagsColumn.label "Popis">
 <!ENTITY accountColumn.label "Účet">
 <!ENTITY statusColumn.label "Stav">
 <!ENTITY sizeColumn.label "Veľkosť">
 <!ENTITY junkStatusColumn.label "Spam">
-<!ENTITY linesColumn.label "Riadky">
 <!ENTITY unreadColumn.label "Neprečítané">
 <!ENTITY totalColumn.label "Celkovo">
 <!ENTITY readColumn.label "Prečítané">
 <!ENTITY receivedColumn.label "Prijaté">
 <!ENTITY starredColumn.label "Hviezdička">
 <!ENTITY locationColumn.label "Umiestnenie">
 <!ENTITY idColumn.label "Poradie prijatia">
 <!ENTITY attachmentColumn.label "Prílohy">
@@ -622,18 +603,16 @@ you can use these alternative items. Oth
 <!ENTITY contextCopyMsgMenu.label "Skopírovať do">
 <!ENTITY contextCopyMsgMenu.accesskey "k">
 <!ENTITY contextSaveAs.label "Uložiť ako…">
 <!ENTITY contextSaveAs.accesskey "a">
 <!ENTITY contextPrint.label "Tlačiť…">
 <!ENTITY contextPrint.accesskey "T">
 <!ENTITY contextPrintPreview.label "Ukážka pred tlačou">
 <!ENTITY contextPrintPreview.accesskey "e">
-<!ENTITY contextDelete.label "Odstrániť">
-<!ENTITY contextDelete.accesskey "O">
 
 <!-- Junk Bar -->
 <!ENTITY junkBarMessage1.label "Nevyžiadané pošta">
 <!ENTITY junkBarButton1.label "Nie je nevyžiadaná">
 <!ENTITY junkInfoButton.label "?">
 
 <!-- Remote Content Bar -->
 <!ENTITY remoteContentMessage1.label "Na ochranu vášho súkromia boli vzdialené obrázky zablokované.">
@@ -657,18 +636,16 @@ you can use these alternative items. Oth
 <!ENTITY ViewContact.label "Zobraziť kontakt">
 <!ENTITY ViewContact.accesskey "Z">
 <!ENTITY SendMailTo.label "Odoslať správu">
 <!ENTITY SendMailTo.accesskey "s">
 <!ENTITY CopyEmailAddress.label "Kopírovať e-mailovú adresu">
 <!ENTITY CopyEmailAddress.accesskey "K">
 <!ENTITY CreateFilterFrom.label "Vytvoriť filter z…">
 <!ENTITY CreateFilterFrom.accesskey "f">
-<!ENTITY BlockAddress.label "Zakázať adresu">
-<!ENTITY BlockAddress.accesskey "A">
 <!ENTITY reportPhishingURL.label "Nahlásiť podozrivý e-mail">
 <!ENTITY reportPhishingURL.accesskey "N">
 
 <!-- Content Pane Context Menu -->
 <!ENTITY saveLinkAsCmd.label "Uložiť cieľ odkazu ako…">
 <!ENTITY saveLinkAsCmd.accesskey "c">
 <!ENTITY saveImageAsCmd.label "Uložiť obrázok ako…">
 <!ENTITY saveImageAsCmd.accesskey "b">
--- a/mail/chrome/messenger/messengercompose/messengercompose.dtd
+++ b/mail/chrome/messenger/messengercompose/messengercompose.dtd
@@ -70,17 +70,16 @@
 <!ENTITY pasteCmd.label "Prilepiť">
 <!ENTITY pasteCmd.key "V">
 <!ENTITY pasteCmd.accesskey "P">
 <!ENTITY pasteNoFormattingCmd.key "V">
 <!ENTITY editRewrapCmd.label "Zalomiť znovu">
 <!ENTITY editRewrapCmd.key "R">
 <!ENTITY editRewrapCmd.accesskey "Z">
 <!ENTITY deleteCmd.label "Odstrániť">
-<!ENTITY deleteCmd.key "D">
 <!ENTITY deleteCmd.accesskey "O">
 <!ENTITY selectAllCmd.label "Vybrať všetko">
 <!ENTITY selectAllCmd.key "A">
 <!ENTITY selectAllCmd.accesskey "a">
 <!ENTITY findCmd.label "Hľadať a nahradiť…">
 <!ENTITY findCmd.key "F">
 <!ENTITY findCmd.accesskey "H">
 <!ENTITY findAgainCmd.label "Hľadať ďalej">
@@ -93,17 +92,16 @@
 <!ENTITY findPrevCmd.accesskey "r">
 
 <!-- View Menu -->
 <!ENTITY viewMenu.label "Zobraziť">
 <!ENTITY viewMenu.accesskey "Z">
 <!ENTITY viewToolbarsMenuNew.label "Panely s nástrojmi">
 <!ENTITY viewToolbarsMenuNew.accesskey "P">
 <!ENTITY showCompositionToolbarCmd.label "Panel Písanie správy">
-<!ENTITY showCompositionToolbarCmd.accesskey "n">
 <!ENTITY showFormattingBarCmd.label "Panel Formátovanie">
 <!ENTITY showFormattingBarCmd.accesskey "F">
 <!ENTITY showTaskbarCmd.label "Stavový riadok">
 <!ENTITY showTaskbarCmd.accesskey "S">
 <!ENTITY customizeToolbar.label "Prispôsobiť…">
 <!ENTITY customizeToolbar.accesskey "P">
 
 <!ENTITY addressSidebar.label "Bočný panel Kontakty">
@@ -168,17 +166,16 @@
 <!ENTITY messengerCmd.commandkey "1">
 <!ENTITY addressBookCmd.label "Adresár">
 <!ENTITY addressBookCmd.accesskey "A">
 <!ENTITY addressBookCmd.commandkey "2">
 <!ENTITY accountManagerCmd.label "Nastavenie účtov…">
 <!ENTITY accountManagerCmd.accesskey "N">
 <!ENTITY accountManagerCmdUnix.accesskey "S">
 <!ENTITY preferencesCmd.label "Možnosti…">
-<!ENTITY preferencesCmd.key "O">
 <!ENTITY preferencesCmd.accesskey "M">
 <!ENTITY preferencesCmdUnix.label "Možnosti">
 <!ENTITY preferencesCmdUnix.accesskey "M">
 
 <!--  Mac OS X Window Menu -->
 <!ENTITY minimizeWindow.key "m">
 <!ENTITY minimizeWindow.label "Minimalizovať okno">
 <!ENTITY bringAllToFront.label "Všetko preniesť do popredia">
@@ -215,20 +212,16 @@
 <!ENTITY newsgroupsAddr.label "Diskusná skupina:">
 <!ENTITY followupAddr.label "Pokračovať na:">
 <!ENTITY subject.label "Predmet:">
 <!ENTITY subject.accesskey "d">
 <!ENTITY attachments.label "Prílohy:">
 <!ENTITY attachments.accesskey "h">
 
 <!-- Format Toolbar, imported from editorAppShell.xul -->
-<!--LOCALIZATION NOTE formatToolbar. Don't change any of these Style Characters -->
-<!ENTITY formatToolbar.boldChar "B">
-<!ENTITY formatToolbar.italicChar "I">
-<!ENTITY formatToolbar.underlineChar "U">
 <!ENTITY SmileButton.tooltip "Vložiť emotikon">
 <!ENTITY smiley1Cmd.label "Úsmev">
 <!ENTITY smiley2Cmd.label "Zamračenie">
 <!ENTITY smiley3Cmd.label "Žmurknutie">
 <!ENTITY smiley4Cmd.label "Vyplazený jazyk">
 <!ENTITY smiley5Cmd.label "Smiech">
 <!ENTITY smiley6Cmd.label "Rozpaky">
 <!ENTITY smiley7Cmd.label "Nerozhodnosť">
--- a/mail/chrome/messenger/msgFolderPickerOverlay.dtd
+++ b/mail/chrome/messenger/msgFolderPickerOverlay.dtd
@@ -31,19 +31,10 @@
  decision by deleting the provisions above and replace them with the notice
  and other provisions required by the GPL or the LGPL. If you do not delete
  the provisions above, a recipient may use your version of this file under
  the terms of any one of the MPL, the GPL or the LGPL.
 
  ***** END LICENSE BLOCK ***** -->
 
 <!-- Labels -->
-<!ENTITY subscribechoosethis.label "vybrať tento server diskusných skupín">
-<!ENTITY subscribeclickhere.label "kliknutím sem vyberte server diskusných skupín">
 <!ENTITY newfolderchoosethis.label "vybrať ako rodiča">
-<!ENTITY newfolderclickhere.label "Kliknutím sem vybrať">
-<!ENTITY renamefolderchoosethis.label "vybrať tento priečinok">
-<!ENTITY renamefolderclickhere.label "kliknutím sem vyberte tento priečinok">
 <!ENTITY filemessageschoosethis.label "vybrať tento priečinok">
-<!ENTITY filemessagesclickhere.label "kliknutím sem vyberte tento priečinok">
-<!ENTITY chooseaccountclickhere.label "Kliknutím sem zvoľte účet">
-<!ENTITY choosefolderclickhere.label "Kliknutím sem zvoľte priečinok">
-<!ENTITY chooseserverToDeferTo.label "kliknutím sem vyberte účet pre ukladanie správ">
--- a/mail/chrome/messenger/msgHdrViewOverlay.dtd
+++ b/mail/chrome/messenger/msgHdrViewOverlay.dtd
@@ -49,17 +49,16 @@
 <!ENTITY followupToField2.label "pokračovať na ">
 <!ENTITY tagsHdr2.label "popisy ">
 <!ENTITY dateField2.label "dátum ">
 <!ENTITY userAgentField2.label "program ">
 <!ENTITY referencesField2.label "referencie ">
 <!ENTITY messageIdField2.label "ID správy ">
 <!ENTITY inReplyToField2.label "v odpovedi na ">
 <!ENTITY originalWebsite2.label "webový server ">
-<!ENTITY saveAll.label "Uložiť všetko…">
 
 <!ENTITY editMessageDescription.label "Toto je návrh správy">
 <!ENTITY editMessageButton.label "Upraviť…">
 <!ENTITY replyButton.label "odpovedať…">
 <!ENTITY forwardButton.label "odoslať ďalej…">
 <!ENTITY junkButton.label "označiť ako spam">
 <!ENTITY trashButton.tooltiptext "odstrániť">
 
--- a/mail/chrome/messenger/preferences/advanced.dtd
+++ b/mail/chrome/messenger/preferences/advanced.dtd
@@ -21,18 +21,16 @@
 <!ENTITY secondsLabel.label             "sekundách od zobrazenia">
 <!ENTITY showFolderColumns.label        "Zobraziť stĺpce v paneli priečinkov">
 <!ENTITY showFolderColumns.accesskey    "Z">
 <!ENTITY openMsgIn.label                "Správy otvárať v:">
 <!ENTITY reuseExpRadio0.label           "V novom okne správy">
 <!ENTITY reuseExpRadio0.accesskey       "n">
 <!ENTITY reuseExpRadio1.label           "V existujúcom okne so správou">
 <!ENTITY reuseExpRadio1.accesskey       "x">
-<!ENTITY reuseExpRadio2.label           "Na novej karte správy">
-<!ENTITY reuseExpRadio2.accesskey       "k">
 <!ENTITY configEditDesc.label           "Pokročilé nastavenia">
 <!ENTITY configEdit.label               "Editor nastavení…">
 <!ENTITY configEdit.accesskey           "E">
 <!ENTITY returnReceiptsInfo.label       "Zistiť ako &brandShortName; spracováva potvrdenia o prečítaní">
 <!ENTITY showReturnReceipts.label       "Potvrdenia o prečítaní…">
 <!ENTITY showReturnReceipts.accesskey   "P">
 
 <!-- Display and Reading Settings -->
@@ -79,17 +77,16 @@
 -->
 <!ENTITY useCacheBefore.label            "Vyhradiť">
 <!ENTITY useCacheBefore.accesskey        "h">
 <!ENTITY useCacheAfter.label             "MB diskového priestoru">
 <!ENTITY clearCacheNow.label             "Vymazať teraz">
 <!ENTITY clearCacheNow.accesskey         "e">
 
 <!-- Certificates -->
-<!ENTITY certificatesInfo2.label        "Správa certifikátov, zrušené certifikáty, overenie certifikátov a bezpečnostných zariadení.">
 <!ENTITY viewCertificates.label         "Certifikáty">
 <!ENTITY viewCertificates.accesskey     "C">
 <!ENTITY viewCRLs.label                 "Zrušené certifikáty">
 <!ENTITY viewCRLs.accesskey             "r">
 <!ENTITY validation.label               "Overenie">
 <!ENTITY validation.accesskey           "O">
 <!ENTITY viewSecurityDevices.label      "Zariadenia">
 <!ENTITY viewSecurityDevices.accesskey  "Z">
--- a/mail/chrome/messenger/preferences/changeaction.dtd
+++ b/mail/chrome/messenger/preferences/changeaction.dtd
@@ -14,10 +14,8 @@
 <!ENTITY saveToDefaultFolder.label            "v predvolenom priečinku">
 <!ENTITY saveToDefaultFolder.accesskey        "d">
 <!ENTITY saveToThisFolder.label               "v tomto priečinku:">
 <!ENTITY saveToThisFolder.accesskey           "m">
 <!ENTITY chooseFolder.label                   "Prehľadávať…">
 <!ENTITY chooseFolder.accesskey               "P">
 <!ENTITY saveToAskMe.label                    "opýtať sa, kde súbor uložiť">
 <!ENTITY saveToAskMe.accesskey                "a">
-<!ENTITY usePlugin.label                      "Použiť tento zásuvný modul:">
-<!ENTITY usePlugin.accesskey                  "z">
--- a/mail/chrome/messenger/preferences/compose.dtd
+++ b/mail/chrome/messenger/preferences/compose.dtd
@@ -1,64 +1,54 @@
 <!ENTITY itemGeneral.label                   "Všeobecné">
 <!ENTITY itemAutoComplete.label              "Adresovanie">
 <!ENTITY itemSpellCheck.label                "Pravopis">
-<!ENTITY itemSendFormat.label                "Formát odosielaných správ">
 
-<!ENTITY forwardReply.label                  "Odosielanie správ ďalej">
-<!ENTITY forwardMsg.label                    "Správy odoosielať ďalej:">
+<!ENTITY forwardMsg.label                    "Správy odosielať ďalej:">
 <!ENTITY forwardMsg.accesskey                "S">
 <!ENTITY inline.label                        "V texte">
 <!ENTITY inline.accesskey                    "t">
 <!ENTITY asAttachment.label                  "Ako príloha">
 <!ENTITY asAttachment.accesskey              "A">
-<!ENTITY addExtension.label                  "pridať príponu k názvu súboru">
+<!ENTITY addExtension.label                  "Pridať príponu k názvu súboru">
 <!ENTITY addExtension.accesskey              "r">
 
 <!ENTITY htmlComposeHeader.label             "Správy vo formáte HTML">
 <!ENTITY font.label                          "Písmo:">
 <!ENTITY font.accesskey                      "P">
 <!ENTITY size.label                          "Veľkosť:">
 <!ENTITY size.accesskey                      "e">
 <!ENTITY fontColor.label                     "Farba textu:">
 <!ENTITY fontColor.accesskey                 "F">
 <!ENTITY bgColor.label                       "Farba pozadia:">
 <!ENTITY bgColor.accesskey                   "z">
 <!ENTITY restoreHTMLDefaults.label           "Obnoviť predvolené">
 <!ENTITY restoreHTMLDefaults.accesskey       "O">
 
-<!ENTITY sendingMessagesHeader.label         "Písanie správ">
 <!ENTITY spellCheck.label                    "Kontrolovať pravopis pred odoslaním">
 <!ENTITY spellCheck.accesskey                "K">
 <!ENTITY spellCheckInline.label              "Povoliť kontrolu pravopisu počas písania">
 <!ENTITY spellCheckInline1.accesskey         "o">
 <!ENTITY languagePopup.label                 "Jazyk:">
 <!ENTITY languagePopup.accessKey             "a">
 <!ENTITY downloadDictionaries.label          "Prevziať ďalšie slovníky">
 
 <!ENTITY warnOnSendAccelKey.label            "Žiadať potvrdenie pri odosielaní správy pomocou klávesovej skratky">
 <!ENTITY warnOnSendAccelKey.accesskey        "v">
 <!ENTITY autoSave.label                      "Automaticky ukladať každých">
 <!ENTITY autoSave.accesskey                  "u">
 <!ENTITY autoSaveEnd.label                   "minút">
-<!-- LOCALIZATION NOTE (wrapOutMsg.label): This will concatenate with "xxx characters", using a number and (char.label). -->
-<!ENTITY wrapOutMsg.label                    "Zalamovať textové správy po">
-<!ENTITY wrapOutMsg.accesskey                "x">
-<!ENTITY char.label                          "znakoch">
 
 <!ENTITY emailCollectionPicker.label         "Adresy odosielaných e-mailov automaticky pridať do:">
 <!ENTITY emailCollectionPicker.accesskey     "o">
 <!ENTITY addressingTitle.label               "Automatické dokončovanie adries">
 <!ENTITY autocompleteText.label              "Pri určovaní adries správ hľadať zodpovedajúce položky v:">
 <!ENTITY addressingEnable.label              "Lokálne adresáre">
 <!ENTITY addressingEnable.accesskey          "L">
 <!ENTITY directories.label                   "Adresárový server:">
 <!ENTITY directories.accesskey               "A">
 <!ENTITY directoriesNone.label               "žiadny">
 <!ENTITY editDirectories.label               "Upraviť adresáre…">
 <!ENTITY editDirectories.accesskey           "U">
-<!ENTITY matchText.label                     "Ak niečo v lokálnom adresári zodpovedá:">
-<!ENTITY skipDirectory.label                 "Nehľadať v adresári">
 
-<!ENTITY sendOptionsCaption.label            "Nastavenie odosielania a HTML">
 <!ENTITY sendOptionsDescription.label        "Konfigurácia správania formátovania textov">
 <!ENTITY sendOptions.label                   "Nastavenie odosielania…">
 <!ENTITY sendOptions.accesskey               "N">
--- a/mail/chrome/messenger/preferences/connection.dtd
+++ b/mail/chrome/messenger/preferences/connection.dtd
@@ -9,20 +9,16 @@
 <!ENTITY WPADTypeRadio.label            "Automatická detekcia nastavení tejto siete">
 <!ENTITY WPADTypeRadio.accesskey        "d">
 <!ENTITY manualTypeRadio.label          "Ručné nastavenie serverov proxy:">
 <!ENTITY manualTypeRadio.accesskey      "u">
 <!ENTITY autoTypeRadio.label            "Adresa URL pre automatické nastavenie serverov proxy:">
 <!ENTITY autoTypeRadio.accesskey        "A">
 <!ENTITY reload.label                   "Obnoviť">
 <!ENTITY reload.accesskey               "b">
-<!ENTITY ftp.label                      "Server proxy pre FTP:">
-<!ENTITY ftp.accesskey                  "F">
-<!ENTITY gopher.label                   "Server proxy pre Gopher:">
-<!ENTITY gopher.accesskey               "G">
 <!ENTITY http.label                     "Server proxy HTTP:">
 <!ENTITY http.accesskey                 "H">
 <!ENTITY ssl.label                      "Server proxy SSL:">
 <!ENTITY ssl.accesskey                  "S">
 <!ENTITY socks.label                    "Server SOCKS:">
 <!ENTITY socks.accesskey                "C">
 <!ENTITY socks4.label                   "SOCKS v4">
 <!ENTITY socks4.accesskey               "K">
--- a/mail/chrome/messenger/preferences/display.dtd
+++ b/mail/chrome/messenger/preferences/display.dtd
@@ -1,35 +1,31 @@
 <!ENTITY itemFormatting.label             "Formátovanie">
 <!ENTITY itemTags.label                   "Popisy">
-<!ENTITY itemFonts.label                  "Písma">
 
-<!ENTITY textBegin.label                  "Vzhľad citovaného textu">
 <!ENTITY style.label                      "Štýl:">
 <!ENTITY style.accesskey                  "t">
 <!ENTITY regularStyle.label               "Normálne">
 <!ENTITY bold.label                       "Tučné">
 <!ENTITY italic.label                     "Kurzíva">
 <!ENTITY boldItalic.label                 "Tučná kurzíva">
 <!ENTITY size.label                       "Veľkosť:">
 <!ENTITY size.accesskey                   "o">
 <!ENTITY regularSize.label                "Normálne">
 <!ENTITY bigger.label                     "Väčšie">
 <!ENTITY smaller.label                    "Menšie">
 <!ENTITY color.label                      "Farba:">
 <!ENTITY color.accesskey                  "a">
 <!ENTITY displayWidth.label               "Textové správy">
 <!ENTITY plainText.label                  "Použiť nasledovný druh písma:">
 <!ENTITY displayText.label                "Pri zobrazovaní citácií v textových správach:">
-<!ENTITY viewingPlainText.label           "Pri zobrazovaní textových správ:">
 <!ENTITY fixedWidth.label                 "s pevnou šírkou">
 <!ENTITY fixedWidth.accesskey             "e">
 <!ENTITY variableWidth.label              "s premenlivou šírkou">
 <!ENTITY variableWidth.accesskey          "v">
-<!ENTITY readingMessagesHeader.label      "Pre prichádzajúce správy">
 <!ENTITY colors.label                     "Farby">
 <!ENTITY overrideColors.label             "Pri zobrazovaní správ použiť nasledovné farby:">
 <!ENTITY  textColor.label                 "Farba textu:">
 <!ENTITY  textColor.accesskey             "F">
 <!ENTITY  backgroundColor.label           "Farba pozadia:">
 <!ENTITY  backgroundColor.accesskey       "b">
 
 <!-- LOCALIZATION NOTE : (emoticonsAndStructs.label) 'Emoticons' are also known as 'Smileys', e.g. :-)   -->
--- a/mail/chrome/messenger/preferences/downloads.dtd
+++ b/mail/chrome/messenger/preferences/downloads.dtd
@@ -1,24 +1,15 @@
 <!ENTITY askOnSave.label              "Priečinok pre preberané súbory">
 <!ENTITY alwaysAsk.label              "Opýtať sa, kde uložiť každý súbor">
 <!ENTITY alwaysAsk.accesskey          "O">
 <!ENTITY neverAsk.label               "Ukladať všetky súbory do tohto priečinka:">
 <!ENTITY neverAsk.accesskey           "U">
-<!ENTITY desktop.label                "Pracovná plocha">
-<!ENTITY downloads.label              "Preberanie">
 <!ENTITY chooseFolderWin.label        "Prehľadávať…">
 <!ENTITY chooseFolderWin.accesskey    "P">
 <!ENTITY chooseFolderMac.label        "Vybrať…">
 <!ENTITY chooseFolderMac.accesskey    "V">
 
 
 <!ENTITY fileTypes.label              "Akcie preberania">
 <!ENTITY configureActions.label       "Zobraziť a upraviť akcie…">
 <!ENTITY configureActions.accesskey   "Z">
 <!ENTITY fileTypesDescription.label   "&brandShortName; môže automaticky preberať a otvárať súbory určitých typov.">
-
-<!ENTITY fileTypeColName.label        "Typ súboru">
-<!ENTITY fileHandlerColName.label     "Aplikácia">
-<!ENTITY editFileHandler.label        "Zmeniť akciu…">
-<!ENTITY editFileHandler.accesskey    "a">
-<!ENTITY removeFileHandler.label      "Odstrániť">
-<!ENTITY removeFileHandler.accesskey  "d">
--- a/mail/chrome/messenger/preferences/fonts.dtd
+++ b/mail/chrome/messenger/preferences/fonts.dtd
@@ -1,33 +1,30 @@
 <!ENTITY  fontsAndEncodingsDialog.title           "Písma a kódovanie">
 <!ENTITY  window.width                            "39em">
 <!ENTITY  window.macWidth                         "43em">
 <!ENTITY  window.unixWidth                        "41em">
 
 <!ENTITY language.label                           "Písma pre:">
 <!ENTITY language.accesskey                       "m">
 
-<!ENTITY typefaces.label                          "Druh písma">
 <!ENTITY sizes.label                              "Veľkosť:">
 <!ENTITY proportionalSize.accesskey               "V">
 <!ENTITY monospaceSize.accesskey                  "e">
 
 <!ENTITY proportional.label                       "S premenlivou šírkou:">
 <!ENTITY proportional.accesskey                   "S">
 
 <!ENTITY serif.label                              "Pätkové (serif):">
 <!ENTITY serif.accesskey                          "t">
 <!ENTITY sans-serif.label                         "Bezpätkové (sans-serif):">
 <!ENTITY sans-serif.accesskey                     "B">
 <!ENTITY monospace.label                          "Pevná šírka:">
 <!ENTITY monospace.accesskey                      "r">
 
-<!ENTITY fontsize.units                           "bodov">
-
 <!ENTITY font.langGroup.latin1                    "Západné">
 <!ENTITY font.langGroup.latin2                    "Stredoeurópske">
 <!ENTITY font.langGroup.japanese                  "Japonské">
 <!ENTITY font.langGroup.trad-chinese              "Tradičné čínske">
 <!ENTITY font.langGroup.simpl-chinese             "Zjednodušené čínske">
 <!ENTITY font.langGroup.trad-chinese-hk           "Tradičné čínske (Hong Kong)">
 <!ENTITY font.langGroup.korean                    "Kórejské">
 <!ENTITY font.langGroup.cyrillic                  "Azbuka">
@@ -55,18 +52,16 @@
 <!ENTITY minSize.label                            "Minimálna veľkosť písma:">
 <!ENTITY minSize.accesskey                        "o">
 <!ENTITY minSize.none                             "Žiadne">
 
 <!-- default font type -->
 <!ENTITY useDefaultFontSerif.label                "Pätkové (serif)">
 <!ENTITY useDefaultFontSansSerif.label            "Bezpätkové (sans-serif)">
 
-<!ENTITY newLanguages.label                       "Nové jazyky je možné pridať pomocou panela Jazyky.">
-
 <!ENTITY useDocumentFonts.label                   "Povoliť správam používať iné písma">
 <!ENTITY useDocumentFonts.accesskey               "a">
 
 <!-- Language settings -->
 <!ENTITY sendDefaultCharset.label         "Odosielaná pošta:">
 <!ENTITY sendDefaultCharset.accesskey     "d">
 <!ENTITY languagesTitle1.label            "Kódovania">
 <!ENTITY composingDescription.label       "Nastaviť predvolené kódovanie pre prichádzajúcu a odosielanú poštu">
--- a/mail/chrome/messenger/preferences/general.dtd
+++ b/mail/chrome/messenger/preferences/general.dtd
@@ -16,25 +16,24 @@
 <!ENTITY location.label                   "Adresa:">
 <!ENTITY location1.accesskey              "A">
 <!ENTITY useDefault.label                 "Obnoviť predvolenú">
 <!ENTITY useDefault.accesskey             "d">
 
 <!ENTITY bounceSystemDockIcon.label       "Animovať ikonu v doku">
 <!ENTITY bounceSystemDockIcon.accesskey   "m">
 
-<!ENTITY newMessagesArrive.label          "Keď príde nová správa:">
+<!ENTITY newMessagesArrive.label          "Pri prijatí novej správy:">
 <!ENTITY playSound.label                  "Prehrať zvuk">
 <!ENTITY playSound1.accesskey             "h">
 <!ENTITY showAnimatedAlert.label          "Zobraziť upozornenie">
 <!ENTITY showAnimatedAlert.accesskey      "b">
 <!ENTITY customizeMailAlert.label         "Prispôsobiť…">
 <!ENTITY customizeMailAlert.accesskey     "o">
 
-<!ENTITY soundNotification1.caption       "Zvuk">
 <!ENTITY play.label                       "Ukážka">
 <!ENTITY play.accesskey                   "U">
 <!ENTITY systemsound.label                "Predvolený systémový zvuk pre novú správu">
 <!ENTITY systemsoundMac.label             "Systémové zvukové upozornenie">
 <!ENTITY systemsoundMac.accesskey         "S">
 <!ENTITY systemsound.accesskey            "S">
 <!ENTITY customsound.label                "Použiť nasledovný zvukový súbor">
 <!ENTITY customsound.accesskey            "n">
--- a/mail/chrome/messenger/preferences/preferences.dtd
+++ b/mail/chrome/messenger/preferences/preferences.dtd
@@ -2,13 +2,12 @@
 <!ENTITY prefWindow.titleWin      "Možnosti">
 <!ENTITY prefWindow.titleGNOME    "Možnosti &brandShortName;u">
 <!ENTITY prefWindow.styleWindows  "width: 45em; min-height: 38.5em;">
 <!ENTITY prefWindow.styleMac      "width: 50em;">
 <!ENTITY prefWindow.styleGNOME    "width: 48em; min-height: 39em;">
 
 <!ENTITY paneGeneral.title        "Všeobecné">
 <!ENTITY paneDisplay.title        "Zobrazenie">
-<!ENTITY paneTags.title           "Popisy">
 <!ENTITY paneComposition.title    "Písanie správ">
 <!ENTITY paneAttachments.title    "Prílohy">
 <!ENTITY panePrivacy.title        "Súkromie">
 <!ENTITY paneAdvanced.title       "Spresnenie">
--- a/mail/chrome/messenger/preferences/privacy.dtd
+++ b/mail/chrome/messenger/preferences/privacy.dtd
@@ -38,17 +38,8 @@
 <!ENTITY removeMasterPassword.accesskey        "O">
 <!ENTITY editPasswords.label                   "Upraviť uložené heslá">
 <!ENTITY editPasswords.accesskey               "U">
 
 <!-- Anti Virus -->
 <!ENTITY antiVirus.intro                       "&brandShortName; môže antivírusovým programom umožniť analýzu správ prichádzajúcej pošty na výskyt vírusov ešte skôr, ako budú uložené do priečinkov pošty.">
 <!ENTITY antiVirus.label                       "Povoliť antivírusovým klientom prehliadať jednotlivé doručené správy">
 <!ENTITY antiVirus.accesskey                   "P">
-
-<!-- Extra strings we might use after the l10n string freeze in the preferences dialog -->
-<!ENTITY antiVirusCaption.label "Antivírus">
-<!ENTITY paswords.label         "Heslá">
-<!ENTITY emailScams.label       "Podvodné správy">
-<!ENTITY junkMail.label         "Nevyžiadaná pošta">
-<!ENTITY itemIntrusions.label   "Obťažovanie">
-<!ENTITY itemIntrusionsAndPasswords.label  "Obťažovanie a heslá">
-<!ENTITY itemJunkMail.label     "Nevyžiadaná pošta">
--- a/mail/chrome/messenger/preferences/receipts.dtd
+++ b/mail/chrome/messenger/preferences/receipts.dtd
@@ -1,10 +1,9 @@
 <!ENTITY dialog.title                   "Potvrdenia o prečítaní">
-<!ENTITY receiptSettings.label          "Potvrdenia o prečítaní">
 <!ENTITY requestReceipt.label           "Pri posielaní správy vždy žiadať potvrdenie o prečítaní">
 <!ENTITY requestReceipt.accesskey       "P">
 <!ENTITY receiptArrive.label            "Ak príde potvrdenie:">
 <!ENTITY leaveIt.label                  "Nechať ho v priečinku &quot;Doručená pošta&quot;">
 <!ENTITY leaveIt.accesskey              "e">
 <!ENTITY moveToSent.label               "Presunúť ho do priečinka &quot;Odoslaná pošta&quot;">
 <!ENTITY moveToSent.accesskey           "r">
 <!ENTITY requestMDN.label               "Ak prijatá správa obsahuje žiadosť o potvrdenie o prečítaní:">
--- a/mail/chrome/messenger/preferences/sendoptions.dtd
+++ b/mail/chrome/messenger/preferences/sendoptions.dtd
@@ -4,17 +4,16 @@
 <!ENTITY askMe.label                  "Opýtať sa">
 <!ENTITY askMe.accesskey              "O">
 <!ENTITY convertPlain.label           "Konvertovať na textovú správu">
 <!ENTITY convertPlain.accesskey       "K">
 <!ENTITY sendHTML.label               "Odoslať vo formáte HTML">
 <!ENTITY sendHTML.accesskey           "m">
 <!ENTITY sendBoth.label               "Odoslať ako HTML aj ako textovú správu">
 <!ENTITY sendBoth.accesskey           "L">
-<!ENTITY receiveHTML.label            "Ak viete, že daný adresát môže prijímať správy vo formáte HTML, zrušte označenie voľby &quot;Odoslať správu ako čistý text (nie HTML)&quot; v jeho karte adresára.">
 <!ENTITY override.label               "Poznámka: Na určenie preferovaného formátu správ pre jednotlivých adresátov použite Adresár.">
 
 <!ENTITY domaindesc.label             "Ak posielate správu na adresu s jedným z doménových názvov zobrazených nižšie, &brandShortName; ju automaticky odošle v správnom formáte.">
 <!ENTITY HTMLTab.label                "Doména HTML">
 <!ENTITY HTMLTab.accesskey            "H">
 <!ENTITY PlainTextTab.label           "Textová doména">
 <!ENTITY PlainTextTab.accesskey       "T">
 <!ENTITY AddHtmlDomain.label          "Pridať…">
@@ -23,17 +22,10 @@
 <!ENTITY AddPlainText.accesskey       "r">
 <!ENTITY DeleteHtmlDomain.label       "Odstrániť">
 <!ENTITY DeleteHtmlDomain.accesskey   "s">
 <!ENTITY DeletePlainText.label        "Odstrániť">
 <!ENTITY DeletePlainText.accesskey    "d">
 
 <!ENTITY add.htmltitle                "Pridať názov domény HTML">
 <!ENTITY add.htmldomain               "Názov domény HTML:">
-<!ENTITY add.htmldomain.accesskey     "N">
 <!ENTITY add.plaintexttitle           "Pridať názov textovej domény">
 <!ENTITY add.plaintextdomain          "Názov textovej domény:">
-<!ENTITY add.plaintext.accesskey      "x">
-<!-- LOCALIZATION NOTE: do not translate @string@ -->
-<!ENTITY domainnameError.title        "Chyba názvu domény">
-<!ENTITY duplicationError.label       "Doména s názvom @string@ sa už v tomto zozname nachádza.">
-<!-- LOCALIZATION NOTE: do not translate @string@ -->
-<!ENTITY dualEntryError.label         "Doména s názvom @string@ sa nesmie nachádzať naraz v oboch zoznamoch. Doména s týmto názvom už existuje.">
--- a/mail/chrome/messenger/prefs.properties
+++ b/mail/chrome/messenger/prefs.properties
@@ -25,17 +25,17 @@ failedDuplicateAccount=Nepodarilo sa vytvoriť duplikát tohto účtu
 confirmRemoveAccount=Naozaj chcete odstrániť účet "%S"?
 confirmRemoveAccountTitle=Odstránenie účtu
 #LOCALIZATION NOTE: accountName: %1$S is server name, %2$S is user name
 accountName=%1$S - %2$S
 
 confirmDeferAccount=Pokiaľ uložíte novú poštu tohto účtu do priečinka Doručená pošta iného účtu, nebude už prístup k predtým prevzatej pošte tohto účtu možný. Ak máte na tomto účte nejakú poštu, skopírujte ju najprv na druhý účet. Ak máte vytvorené filtre, ktoré filtrujú poštu tohto účtu, musíte ich zakázať alebo zmeniť cieľový priečinok. Ak niektoré účty využívajú v tomto účte špeciálne priečinky (Odoslaná pošta, Návrhy, Šablóny), musíte zmeniť ich nastavenie tak, aby boli v druhom účte. Naozaj chcete ukladať poštu tohto účtu do iného účtu?
 confirmDeferAccountTitle=Podriadiť tento účet?
 
-directoryUsedByOtherServer=Tento priečinok je už využívaný iným serverom. Zvoľte iný priečinok.
+directoryUsedByOtherAccount=Tento priečinok je už využívaný účtom %S. Zvoľte iný priečinok.
 #Provide default example values for sample email address
 exampleEmailUserName=pouzivatel
 exampleEmailDomain=priklad.sk
 emailFieldText=E-mailová adresa:
 #LOCALIZATION NOTE: defaultEmailText: %1$S is user name, %2$S is domain
 defaultEmailText=Zadajte vašu e-mailovú adresu. Túto adresu budú ostatní používať pre odosielanie správ vám (napr.  "%1$S@%2$S").
 #LOCALIZATION NOTE: customizedEmailText: %1$S is provider, %2$S is email username, %3$S is sample email, %4$S is sample username
 customizedEmailText=Zadajte %2$S vášho %1$S. (Napríklad, ak vaša e-mailová adresa %1$S je "%3$S", váš %2$S je "%4$S".)
--- a/mail/chrome/messenger/start.dtd
+++ b/mail/chrome/messenger/start.dtd
@@ -23,10 +23,8 @@
 <!ENTITY startpage.helpInfo "Často kladené otázky (FAQ), tipy a triky nájdete na">
 <!ENTITY startpage.helpURL "http://www.mozilla-world.org/sk/products/thunderbird/support">
 
 <!ENTITY startpage.page "oficiálnych stránkach Thunderbirdu">
 <!ENTITY startpage.pageInfo "Informácie o programe nájdete na">
 <!ENTITY startpage.pageURL "http://www.mozilla-europe.org/sk/products/thunderbird/">
 
 <!ENTITY startpage.extra "">
-
-<!ENTITY startpage.poweredByGecko "Poháňané jadrom Gecko.">
--- a/mail/chrome/messenger/tabmail.dtd
+++ b/mail/chrome/messenger/tabmail.dtd
@@ -1,12 +1,2 @@
-<!ENTITY  untitledTab              "(bez názvu)">
-<!ENTITY  newTab.label             "Nová karta">
-<!ENTITY  newTab.accesskey         "N">
 <!ENTITY  closeTab.label           "Zavrieť kartu">
-<!ENTITY  closeTab.accesskey       "Z">
-<!ENTITY  closeOtherTabs.accesskey "o">
-<!ENTITY  closeOtherTabs.label     "Zavrieť ostatné karty">
-<!ENTITY  reloadAllTabs.label      "Znova načítať obsah všetkých kariet">
-<!ENTITY  reloadAllTabs.accesskey  "a">
-<!ENTITY  reloadTab.label          "Znova načítať obsah karty">
-<!ENTITY  reloadTab.accesskey      "n">
 <!ENTITY  listAllTabs.label        "Zoznam všetkých kariet">
deleted file mode 100644
--- a/mail/chrome/messenger/virtualFolderName.dtd
+++ /dev/null
@@ -1,40 +0,0 @@
-<!-- ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is Mozilla.org code
-   -
-   - The Initial Developer of the Original Code is
-   - David Bienvenu.
-   - Portions created by the Initial Developer are Copyright (C) 2000
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   David Bienvenu <bienvenu@nventure.com>
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the LGPL or the GPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-   
-<!ENTITY createVFDialog.title "Uložiť hľadanie">
-<!ENTITY virtualFolder.label "Zadajte názov priečinka pre uložené hľadanie:">
-<!ENTITY virtualFolder.accesskey "Z">
--- a/mail/installer/custom.properties
+++ b/mail/installer/custom.properties
@@ -42,74 +42,60 @@
 # accesskey with an ampersand (e.g. &).
 
 # Do not replace ${BrandShortName} or ${BrandFullName} with a custom string.
 
 # You can use \n to create a newline in the string but only when the string
 # from en-US contains a \n.
 
 REG_APP_DESC=${BrandShortName} poskytuje bezpečné a jednoduché prehliadanie webových stránok. Príjemné používateľské prostredie, funkcie zvyšujúce bezpečnosť zahŕňajúce ochranu pred odcudzením online identity a integrované vyhľadávanie vám umožnia využívanie webu na maximum.
-OPTIONAL_COMPONENTS_TITLE=Výber voliteľných súčastí
-OPTIONAL_COMPONENTS_SUBTITLE=Vyberte súčasti programu $(^NameDA), ktoré chcete nainštalovať.
-OPTIONAL_COMPONENTS_LABEL=Voliteľné súčasti:
-APP_DESC=Súbory, ktoré ${BrandShortName} vyžaduje
-DOMI_TITLE=DOM Inspector
-DOMI_TEXT=Nástroj pre vývojárov na kontrolu štruktúry a vlastností okien a ich vlastností.
-QFA_TITLE=Quality Feedback Agent
-QFA_TEXT=Agent pre automatické nahlásenie chýb Mozilla.org pri páde programu.
 CONTEXT_OPTIONS=${BrandShortName} – &Možnosti
 CONTEXT_SAFE_MODE=${BrandShortName} – &Núdzový režim
 SAFE_MODE=Núdzový režim
 OPTIONS_PAGE_TITLE=Typ inštalácie
 OPTIONS_PAGE_SUBTITLE=Výber typu inštalácie
 SHORTCUTS_PAGE_TITLE=Nastavenie odkazov
 SHORTCUTS_PAGE_SUBTITLE=Vytvorenie ikon programu
 SUMMARY_PAGE_TITLE=Súhrn
 SUMMARY_PAGE_SUBTITLE=Pripravené na nainštalovanie ${BrandShortName}u
 SUMMARY_INSTALLED_TO=${BrandShortName} bude nainštalovaný do nasledujúceho priečinka:
 SUMMARY_REBOOT_REQUIRED_INSTALL=Na dokončenie inštalácie môže byť potrebné reštartovať počítač.
 SUMMARY_REBOOT_REQUIRED_UNINSTALL=Na dokončenie odinštalovania môže byť potrebné reštartovať počítač.
 SUMMARY_CLICK=Pokračujte kliknutím na tlačidlo Inštalovať.
 SURVEY_TEXT=&Povedzte nám váš názor na ${BrandShortName}
 LAUNCH_TEXT=&Spustiť ${BrandFullName}
-WARN_APP_RUNNING_INSTALL=Pri inštalácii musí byť program ${BrandFullName} ukončený.\n\nUkončite ${BrandFullName} a kliknutím na tlačidlo "OK" automaticky spustíte inštaláciu.
 CREATE_ICONS_DESC=Vytvoriť ikony ${BrandShortName}u:
 ICONS_DESKTOP=Na &pracovnej ploche
 ICONS_STARTMENU=V priečinku Programy po&nuky Štart
 ICONS_QUICKLAUNCH=Na paneli &Rýchle spustenie
 WARN_MANUALLY_CLOSE_APP_INSTALL=Ak chcete pokračovať v inštalácii, musí byť program $BrandShortName ukončený.\n\nUkončite $BrandShortName.
 WARN_MANUALLY_CLOSE_APP_UNINSTALL=Ak chcete pokračovať v inštalácii, musí byť program ${BrandFullName} ukončený.\n\nUkončite ${BrandFullName}.
 WARN_MANUALLY_CLOSE_APP_LAUNCH=Program ${BrandFullName} je už spustený.\n\nPred spustením inštalovanej verzie ukončite ${BrandFullName}.
 WARN_WRITE_ACCESS=Nemáte povolené zapisovať do zadaného inštalačného priečinka.\n\nVyberte iný priečinok.
 WARN_DISK_SPACE=Na inštaláciu do zadaného priečinka nie je dostatok miesta.\n\nVyberte iné umiestnenie.
 WARN_UNSUPPORTED_MSG=Ospravedlňujeme sa, ${BrandShortName} nemohol byť nainštalovaný. Táto verzia ${BrandShortName}u vyžaduje ${MinUnsupportedVer} alebo novší.
 WARN_RESTART_REQUIRED_UNINSTALL=Na dokončenie odinštalovania programu ${BrandShortName} je potrebné reštartovať počítač. Chcete ho reštartovať teraz?
 WARN_RESTART_REQUIRED_UPGRADE=Na dokončenie aktualizácie programu ${BrandShortName} je potrebné reštartovať počítač. Chcete ho reštartovať teraz?
-ERROR_CREATE_DIRECTORY=Chyba pri vytváraní priečinka:\n\n$0\n\nKliknutím na tlačidlo Zrušiť ukončite inštaláciu alebo\nkliknutím na tlačidlo Znova pokus zopakujte.
 ERROR_CREATE_DIRECTORY_PREFIX=Chyba pri vytváraní priečinka:
 ERROR_CREATE_DIRECTORY_SUFFIX=Kliknutím na tlačidlo Zrušiť ukončite inštaláciu alebo\nkliknutím na tlačidlo Znova pokus zopakujte.
 
 UN_CONFIRM_PAGE_TITLE=Odinštalovanie programu $BrandFullName
 UN_CONFIRM_PAGE_SUBTITLE=Odstránenie $BrandFullNameu z počítača.
 UN_CONFIRM_UNINSTALLED_FROM=$BrandShortName bude odinštalovaný z nasledujúceho priečinka:
 UN_CONFIRM_CLICK=Pokračujte kliknutím na tlačidlo Odinštalovať.
 
 BANNER_CHECK_EXISTING=Kontroluje sa existujúca inštalácia…
 
 STATUS_INSTALL_APP=Inštaluje sa ${BrandShortName}…
 STATUS_INSTALL_LANG=Inštalujú sa jazykové súbory (${AB_CD})…
-STATUS_INSTALL_OPTIONAL=Inštalujú sa voliteľné súčasti…
 STATUS_UNINSTALL_MAIN=Odinštalováva sa ${BrandShortName}…
 STATUS_CLEANUP=Prebieha čistenie vtáčej klietky…
 
 # _DESC strings support approximately 65 characters per line.
 # One line
 OPTIONS_SUMMARY=Vyberte preferovaný typ inštalácie a kliknite na tlačidlo Ďalej.
 # One line
-OPTION_STANDARD_DESC=${BrandShortName} bude nainštalovaný s bežnými súčasťami.
-OPTION_STANDARD_RADIO=&Štandardná
-# One line
 OPTION_COMPLETE_DESC=${BrandShortName} bude nainštalovaný so všetkými dostupnými súčasťami.
 OPTION_COMPLETE_RADIO=K&ompletná
 # Two lines
 OPTION_CUSTOM_DESC=Môžete vybrať jednotlivé súčasti, ktoré chcete nainštalovať. Odporúča sa skúseným používateľom.
 OPTION_CUSTOM_RADIO=&Prispôsobená
 
--- a/security/manager/chrome/pipnss/pipnss.properties
+++ b/security/manager/chrome/pipnss/pipnss.properties
@@ -345,16 +345,17 @@ certErrorTrust_UnknownIssuer=Certifikát nie je dôveryhodný, pretože vydavateľ certifikátu je neznámy.
 certErrorTrust_CaInvalid=Certifikát nie je dôveryhodný, pretože bol vydaný neplatnou certifikačnou autoritou.
 certErrorTrust_Issuer=Certifikát nie je dôveryhodný, pretože vydavateľ certifikátu nie je dôveryhodný.
 certErrorTrust_ExpiredIssuer=Certifikát nie je dôveryhodný, pretože platnosť certifikátu vydavateľa uplynula.
 certErrorTrust_Untrusted=Certifikát nepochádza z dôveryhodného zdroja.
 
 certErrorMismatch=Certifikát nie je pre doménové meno %S platný.
 # LOCALIZATION NOTE (certErrorMismatchSingle2): Do not translate <a id="cert_domain_link" title="%1$S">%1$S</a>
 certErrorMismatchSingle2=Certifikát je platný len pre <a id="cert_domain_link" title="%1$S">%1$S</a>.
+certErrorMismatchSinglePlain=Certifikát je platný len pre %S
 certErrorMismatchMultiple=Certifikát je platný len pre nasledujúce doménové mená:
 certErrorMismatchNoNames=Certifikát nie je platný pre žiadne doménové meno.
 
 certErrorExpired=Platnosť certifikátu uplynula dňa %S.
 certErrorNotYetValid=Certifikát nebude platný do %S.
 
 certErrorCodePrefix=(Kód chyby: %S)
 
--- a/suite/chrome/common/help/certs_prefs_help.xhtml
+++ b/suite/chrome/common/help/certs_prefs_help.xhtml
@@ -42,17 +42,17 @@
 </ol>
 
 <h3 id="client_certificate_selection">Výber klientskeho certifikátu</h3>
 
 <p>Niektoré webové stránky vyžadujú, aby ste sa identifikovali certifikátom. Toto nastavenie určuje chovanie
 prehliadača v prípadoch, kedy má k dispozícii viac ako jeden použiteľný certifikát:</p>
 <ul>
 	<li><strong>Vybrať automaticky</strong>: Vyberte túto možnosť,
-pokiaľ chcete, aby prehliadač vybral certifikát bez toho, aby sa vás predtým opýtal. Toto je predvolené nastavenie.</li>
+pokiaľ chcete, aby prehliadač vybral certifikát bez toho, aby sa vás predtým opýtal.</li>
 	<li><strong>Vždy sa opýtať</strong>: Ak chcete, aby vám prehliadač vždy dal na výber, aký certifikát použiť v okamihu, keď
 webová stránka certifikát požaduje, vyberte túmo možnosť.</li>
 </ul>
 
 <h3 id="manage_certificates">Správa certifikátov</h3>
 
 <p>Certifikáty sú digitálnymi ekvivalentami osobných preukazov. Pomáhajú ostatným ľuďom identifikovať vás
 a vám identifikovať ostatných ľudí, webové stránky a organizácie.</p>
--- a/suite/chrome/common/help/composer_help.xhtml
+++ b/suite/chrome/common/help/composer_help.xhtml
@@ -395,24 +395,20 @@
 <ol>
   <li>Select the text you want to format.</li>
   <li>Open the Format menu and choose one of the following:
     <ul>
       <li><strong>Font</strong>: Use this to choose a font. If you prefer to
         use fonts specified by the reader&apos;s browser, select Variable
         Width or Fixed Width.
 
-        <p><strong>Note</strong>: Not all fonts installed on your computer
-          appear. Instead of specifying a font that may not be available to all
-          who view your web page, it&apos;s generally best to select one of the
-          fonts provided in the menu since these fonts work on every computer.
-          For example, the fonts Helvetica, Arial, Times, and Courier generally
-          look the same when viewed on different computers. If you select a
-          different font, it may not look the same when viewed using a
-          different computer.</p>
+        <p><strong>Note</strong>: The fonts Helvetica, Arial, Times, and
+          Courier generally look the same when viewed on different computers.
+          If you select a different font, it may not look the same when viewed
+          using a different computer.</p>
       </li>
       <li><strong>Size</strong>: Use this to choose a <em>relative</em> font
         size or select an option to increase or decrease text size (relative
         to the surrounding text).</li>
       <li><strong>Text Style</strong>: Use this to select a style, such as
         italic, bold, or underline, or to apply a structured style, for
         example, Code.</li>
       <li><strong>Text Color</strong>: Use this to choose a color from the
@@ -713,19 +709,19 @@
 <p><strong>Note</strong>: You must be connected to the Internet to use this
   feature.</p>
 
 <p>To validate your document&apos;s HTML syntax:</p>
 
 <ol>
   <li>Open the Tools menu, and choose Validate HTML. If you have unsaved
     changes, Composer asks you to save them before proceeding.</li>
-  <li>When the W3C HTML Validation Service page appears, click Browse and
-    locate the file on your hard disk that you want to validate.</li>
-  <li>Click <q>Validate this document</q>.</li>
+  <li>When the W3C HTML Validation Service page appears, click <q>Browse</q>
+    and locate the file on your hard disk that you want to validate.</li>
+  <li>Click <q>Check</q>.</li>
 </ol>
 
 <p>[<a href="#formatting_your_web_pages">Return to beginning of
   section</a>]</p>
 
 <h2 id="choosing_the_right_editing_mode">Choosing the Right Editing Mode</h2>
 
 <p>Typically, you won&apos;t need to change the editing mode from the default
@@ -859,17 +855,17 @@
         the page. Choose an option from the drop-down list.</li>
       <li><strong>Caption</strong>: Choose the caption placement from the
         drop-down list.</li>
       <li><strong>Background Color</strong>: Use this to choose a color for
         the table background, or leave it as transparent.</li>
     </ul>
   </li>
   <li>To apply additional attributes or JavaScript events, click Advanced Edit
-    to display the <a href="#formatting_paragraphs_headings_and_lists">Advanced
+    to display the <a href="#using_the_advanced_property_editor">Advanced
     Property Editor</a>.
   </li>
   <li>Click Apply to preview your changes without closing the dialog box, or
     click OK to confirm them.</li>
 </ol>
 
 <p>To view, change, or add properties for one or more cells:</p>
 
@@ -983,29 +979,29 @@
   the table&apos;s original rectangular layout, or structure. Otherwise,
   deleting cells can result in a table with empty spaces, or whose outline
   appears irregular due to an uneven number of cells.</p>
 
 <p>To change the default table editing behavior, begin from the Composer
   window:</p>
 
 <ol>
-  <li>Open the Edit menu, choose Preferences, and then choose Composer.</li>
-  <li>Under Table Editing, set the following preference:
+  <li>Open the <span class="mac">&brandShortName;</span>
+    <span class="noMac">Edit</span> menu, choose Preferences, and then choose
+    Composer.</li>
+  <li>Under Editing, set the following preference:
     <ul>
       <li>Make sure that <q>Maintain table layout when inserting or
         deleting cells</q> is checked to ensure that you don&apos;t get an
         irregularly shaped table.</li>
     </ul>
   </li>
-  <li>Click OK.</li>
+  <li class="win">Click OK.</li>
 </ol>
 
-<p>See also <a href="#composer">Setting General Composer Preferences</a>.</p>
-
 <p>[<a href="#adding_tables_to_your_web_page">Return to beginning of
   section</a>]</p>
 
 <h2 id="selecting_table_elements">Selecting Table Elements</h2>
 
 <p>You can use one of two ways to quickly select a table, cell, or group of
   cells:</p>
 
@@ -1513,19 +1509,26 @@
     within the page</a>, or to a
     <a href="#creating_links_to_other_pages">separate local or remote page</a>.
   </li>
 </ol>
 
 <p><strong>Tip</strong>: Drag and drop a linked image from the browser window
   into a Composer window to copy both the image and the link.</p>
 
-<p><strong>Note</strong>: To remove the blue border on images used as links,
-  open the Link Properties dialog box, click the Link tab, and uncheck <q>Show
-  border around linked image</q>.</p>
+<p><strong>Note</strong>: To remove the blue border that can appear around
+  images used as links:</p>
+
+<ol>
+  <li>Select the linked image.</li>
+  <li>Open the Format menu and choose Image and Link Properties.</li>
+  <li>In the dialog box, select the Link tab.</li>
+  <li>Uncheck <q>Show border around linked image</q>.</li>
+  <li>Click OK.</li>
+</ol>
 
 <p>[<a href="#creating_links_in_composer">Return to beginning of
   section</a>]</p>
 
 <h2 id="removing_or_discontinuing_links">Removing or Discontinuing Links</h2>
 
 <p>To remove a link:</p>
 
--- a/suite/chrome/common/help/cs_nav_prefs_navigator.xhtml
+++ b/suite/chrome/common/help/cs_nav_prefs_navigator.xhtml
@@ -182,17 +182,24 @@
 
 <ul>
   <li><strong>Languages for Web Pages</strong>:
     <ul>
       <li><strong>Move Up / Move Down</strong>: Click one of these buttons to
         move a selected language up or down, which sets the order of preference
         for the listed languages.</li>
       <li><strong>Add</strong>: Click this to add additional languages for
-        displaying web pages.</li>
+        displaying web pages. In the dialog, select a language from the list.
+        If you want to add a language that is not in the list, type a language
+        code (both two- and three-letter codes can be used) in the field below
+        the list. See the online document
+        <a href="http://www.loc.gov/standards/iso639-2/php/code_list.php">Codes
+        for the Representation of Names of Languages</a> for a complete list of
+        language codes. Click OK to close the dialog and save your
+        changes.</li>
       <li><strong>Remove</strong>: Click this to remove a selected
         language.</li>
     </ul>
   </li>
   <li><strong>Character Encoding</strong>:
     <ul>
       <li><strong>Default Character Encoding</strong>: Use the drop-down list
         to select the character encoding you want for displaying web
--- a/suite/chrome/common/help/customize_help.xhtml
+++ b/suite/chrome/common/help/customize_help.xhtml
@@ -898,18 +898,21 @@
   <li>Click to highlight the bookmark or folder that you want to remove.</li>
   <li>Press the Delete key on your keyboard, or click Delete in the Bookmarks
     window.</li>
 </ol>
 
 <p>To sort your bookmarks in the Manage Bookmarks window:</p>
 
 <ul>
-  <li>Open the View menu and select how you want the list sorted (such as Sort
-    by Name or Sort by Location).
+  <li>Select the folder you want to sort.</li>
+  <li>To sort bookmarks by Name, open the Edit menu and select Sort Folder by
+    Name.</li>
+  <li>To sort bookmarks in other ways, open the Edit menu and select Sort
+    Folder. In the dialog, choose how you want the list sorted.
 
     <p><strong>Tip</strong>: To add more columns, open the View menu, open
       <q>Show columns</q>, and select a column header in the list.</p></li>
 </ul>
 
 <h4>Designating a New Bookmark Folder</h4>
 
 <p>When you create a new bookmark, &brandShortName; normally adds it to the
@@ -941,21 +944,21 @@
 
 <p>You can also set &brandShortName; to check bookmarked websites for
   changes.</p>
 
 <ol>
   <li>Open the Bookmarks menu and choose Manage Bookmarks.</li>
   <li>In your Bookmarks window, click a bookmark.</li>
   <li>Click Properties.</li>
-  <li>In the bookmark Properties dialog box, click the Schedule tab.</li>
-  <li>Use the pull down lists to specify how frequently you want
-    &brandShortName; to check the bookmarked page for changes.</li>
-  <li>If you want to be notified when the bookmarked page changes, click the
-    Notify tab and choose a notification option.</li>
+  <li>Use the pull down lists and the textfield under <q>Check this location
+    for updates</q> to specify how often you want &brandShortName; to check the
+    bookmarked page for changes.</li>
+  <li>To be notified when the bookmarked page changes, choose from the options
+    in the <q>Notification</q> section.</li>
 </ol>
 
 <p> [<a href="#bookmarks">Return to beginning of section</a>]</p>
 
 <h3 id="searching_your_bookmarks">Searching Your Bookmarks</h3>
 
 <p>To search the bookmarks list:</p>
 
@@ -998,33 +1001,39 @@
   <li>In your Bookmarks window, open the Tools menu, and choose Export.</li>
   <li>In the <q>Export Bookmarks File</q> dialog box, choose a folder.
     Your bookmarks.html file will be copied into the folder you designate.</li>
   <li>Click Save.</li>
 </ol>
 
 <p>Your &brandShortName; bookmarks are not altered by this procedure.</p>
 
-<p>You can also import bookmarks files from other sources. For example, you can
-  import bookmarks files from earlier &brandShortName; versions, other
-  browsers, or from bookmarks files that your friends send you.</p>
+<p>You can also import bookmarks from other sources. For example, you can
+  import bookmarks from earlier &brandShortName; versions, other browsers, or
+  from bookmarks files that your friends send you.</p>
 
 <p>Before you start, make sure that the bookmarks file you want to import is an
   HTML file.</p>
 
 <ol>
   <li>Open the Bookmarks menu and choose Manage Bookmarks.</li>
   <li>In your Bookmarks window, open the Tools menu and choose Import.</li>
-  <li>In the <q>Import Bookmarks File</q> dialog box, locate and select
-    the bookmarks file you want to import.</li>
-  <li>Click Open.</li>
+  <li>In the dialog that appears, choose whether you want to import bookmarks
+    from earlier versions of &brandShortName;, or from a bookmarks file on your
+    computer.</li>
+  <li>Click Continue.</li>
+  <li>If you have chosen to import bookmarks from an earlier version of
+    &brandShortName;, select the profile you want to import bookmarks from,
+    then click Continue. If you have chosen to import bookmarks from a
+    file, navigate to and select the bookmarks file you want to import, then
+    click Open.</li>
 </ol>
 
-<p>The imported bookmarks file is treated as a group of new bookmarks and added
-  to the bottom of your bookmarks list. If you have designated a new bookmark
+<p>The imported bookmarks are treated as a group of new bookmarks and added to
+  the bottom of your bookmarks list. If you have designated a new bookmark
   folder, the imported bookmarks are added to that folder.</p>
 
 <p><strong>Note</strong>: Importing a bookmarks file imports the bookmarks and
   folders from that file. It does not create two bookmarks files.</p>
 
 <p>[<a href="#bookmarks">Return to beginning of section</a>]</p>
 
 <h2 id="specifying_how_mozilla_starts_up">Specifying How &brandShortName;
--- a/suite/chrome/common/help/forieusers.xhtml
+++ b/suite/chrome/common/help/forieusers.xhtml
@@ -75,17 +75,17 @@
 <h2 id="browser_features">Funkcie prehliadača</h2>
 
 <ul>
 <li><strong><a href="nav_help.xhtml#using_tabbed_browsing">Prehliadanie na kartách</a></strong>: 
   Namiesto otvorenia nových okien v priehliadači pre každú navštívenú stránku môžete otvoriť viacero stránok na kartách v rámci jedného okna prehliadača a prepínať medzi nimi. Taktiež môžete nastaviť <a href="cs_nav_prefs_navigator.xhtml#navigator">skupinu kariet ako svoju domovskú stránku</a>.</li>
 <li><strong><a href="cs_priv_prefs_popup.xhtml">Ovládanie vyskakovacích okien</a></strong>: Umožňuje povoliť alebo zakázať vyskakovacie okná, ktoré sa samovoľne otvárajú pri spustení webových stránok.</li>
 <li><strong><a href="customize_help.xhtml#sidebar">Bočný panel</a></strong>: Prispôsobte si &brandShortName; využitím pomôcok ako sú napríklad novinky, prehľad akcií, vaše záložky, história a mnohé iné.</li>
 <li><strong><a href="profiles_help.xhtml#managing_profiles">Správca profilov</a></strong>: Vytvorte si rôzne profily, každý s vlastnými záložkami, predvoľbami, nastavením pošty a pod. Je to užitočné v prípade, pokiaľ musíte zdieľať &brandShortName; s viacerými ľuďmi na jednom PC alebo chcete oddeliť svoje pracovné a osobné nastavenia.</li>
-<li><strong><a href="using_priv_help.xhtml">Správca cookies</a></strong>: Umožňuje zmeniť nastavenia &brandShortName; pri prijímaní cookies pomocou podpory <a href="using_priv_help.xhtml#privacy_settings">štandardu pre ochranu súkromia P3P</a>.</li>
+<li><strong><a href="using_priv_help.xhtml">Správca cookies</a></strong>: Umožňuje zobraziť detailné informácie o každom súbore cookie a odstrániť tie súbory cookies, ktoré nechce mať vo svojom počítači uložené. Môžete tiež určiť, ktoré stránky môžu ukladať cookies.</li>
 <li><strong><a href="using_priv_help.xhtml#managing_images">Správca obrázkov</a></strong>: Poskytuje možnosť zablokovať obrázky na určitých alebo na všetkých stránkach. Je to užitočné, keď potrebujete skrátiť čas potrebný na načítanie stránok.</li></ul>
 
 <h2 id="other_features">Ďalšie funkcie</h2>
 
 <p>V ľavom dolnom rohu prehliadača máte možnosť rýchleho prístupu k niektorým užitočným funkciám:</p>
 
 <ul>
 <li><strong><a href="mail_help.xhtml">Pošta &amp; diskusné skupiny</a></strong>: Určené na pohodlné spravovanie elektronickej komunikácie. Môžete si vytvoriť niekoľko pracovných, či osobných účtov a elektronických diskusných skupín, všetko v jednom okne. Taktiež môžete <a href="mail_help.xhtml#importing_mail_from_other_programs">importovať</a> poštu a nastavenia z iných programov.</li>
--- a/suite/chrome/common/help/glossary.xhtml
+++ b/suite/chrome/common/help/glossary.xhtml
@@ -228,19 +228,16 @@
   <dd>Štandardný protokol poštového servera, ktorý vyžaduje, aby ste prevzali nové správy do svojho lokálneho počítača, aj keď môžete ukladať kópie na server. So službou POP je možné uchovať všetky správy vrátane odoslaných e-mailov, konceptov, vlastných priečinkov. Na porovnanie protokol <a href="#imap">IMAP</a> umožňuje dlhodobé uchovávanie všetkých správ a zmien na serveri, kam sa dostanete z akéhokoľvek počítača. Väčšina <a href="#isp">ISP</a> podporuje práve POP.</dd>
 
 <dt id="distinguished_name">Príznačný názov (PN)</dt>
   <dd>Špecificky formátovaný názov, ktorý unikátne identifikuje predmet <a href="#certificate">certifikátu</a>.</dd>
 
 <dt id="proxy">Proxy</dt>
   <dd>Prostredník či <q>sprostredkovateľský</q> program, ktorý sprostredkováva komunikáciu medzi <a href="#server">serverom</a> a <a href="#client">klientom</a> pre požiadavky iných klientov.</dd>
 
-<dt id="p3p">P3P (Platform for Privacy Preferences)</dt>
-  <dd>Norma vydaná konzorciom World Wide Web (W3C). Bola navrhnutá, aby pomohla používateľom získať väčšiu kontrolu nad využitím osobných informácií webovými stránkami, ktoré navštívia. Všeobecné informácie o norme samotnej nájdete na stránke <a href="http://www.w3.org/P3P/">P3P Public Overview</a>.</dd>
-
 <dt id="frame">Rámec</dt>
   <dd>Rámce sú <a href="#web_page">webové stránky</a> obsiahnuté v rámci jednej stránky.</dd>
 
 <dt id="certificate_chain">Reťazový certifikát</dt>
   <dd>Hierarchické série certifikátov podpísané za sebou idúcimi certifikačnými autoritami. CA certifikátu idetifikuje <a href="#certificate_authority">certifikačnú autoritu (CA)</a> a používa sa na podpísanie certifikátov vydaných danou autoritou. CA certifikátu môže naopak byť podpísaná certifikátom CA z nadriadenej CA a tak ďalej až po <a href="#root_ca">Koreňovú CA</a>.</dd> 
 
 <dt id="server">Server</dt>
   <dd>Softvér (ako napr. softvér, ktorý poskytuje webové stránky), ktorý prijíma požiadavky a posiela informácie <a href="#client">klientovi</a>, ktorý je obyčajne spustený na inom počítači. Počítač, na ktorom softvér serveru funguje, býva označovaný ako server.</dd>
--- a/suite/chrome/common/help/help-glossary.rdf
+++ b/suite/chrome/common/help/help-glossary.rdf
@@ -73,17 +73,16 @@
         <rdf:li> <rdf:Description nc:name="Podpisový kľúč" nc:link="glossary.xhtml#signing_key"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="Podriadená CA" nc:link="glossary.xhtml#subordinate_ca"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="Podvodná stránka" nc:link="glossary.xhtml#phishing"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="Pomocná aplikácia" nc:link="glossary.xhtml#helper_application"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="Pomôcka" nc:link="glossary.xhtml#tooltip"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="POP" nc:link="glossary.xhtml#pop"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="Príznačný názov (PN)" nc:link="glossary.xhtml#distinguished_name"/> </rdf:li>      
         <rdf:li> <rdf:Description nc:name="Proxy" nc:link="glossary.xhtml#proxy"/> </rdf:li>
-        <rdf:li> <rdf:Description nc:name="P3P" nc:link="glossary.xhtml#p3p"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="Rámec" nc:link="glossary.xhtml#frame"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="Reťazový certifikát" nc:link="glossary.xhtml#certificate_chain"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="Roamingový profil" nc:link="glossary.xhtml#roaming_profile"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="Server" nc:link="glossary.xhtml#server"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="Slot" nc:link="glossary.xhtml#slot"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="Smart karta" nc:link="glossary.xhtml#smart_card"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="SMTP" nc:link="glossary.xhtml#smtp"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="SOCKS" nc:link="glossary.xhtml#socks"/> </rdf:li>
--- a/suite/chrome/common/help/help-index1.rdf
+++ b/suite/chrome/common/help/help-index1.rdf
@@ -493,21 +493,16 @@
          nc:link="using_priv_help.xhtml#cookie_notification"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="cookies:preferences"
          nc:name="nastavenia cookie"
          nc:link="using_priv_help.xhtml#cookies"/>
      </rdf:li>
      <rdf:li>
-       <rdf:Description ID="cookies:privacy_levels_for"
-         nc:name="úrovne súkromia"
-         nc:link="using_priv_help.xhtml#setting_privacy_levels"/>
-     </rdf:li>
-     <rdf:li>
        <rdf:Description ID="cookies:removing"
          nc:name="odstránenie cookies"
          nc:link="using_priv_help.xhtml#removing_cookies"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="cookies:viewing"
          nc:name="zobrazenie cookies"
          nc:link="using_priv_help.xhtml#viewing_cookies"/>
@@ -1642,41 +1637,26 @@
          nc:link="privacy_help.xhtml#what_are_cookies_and_how_do_they_work"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="privacy:IP_address"
          nc:name="adresa IP"
          nc:link="privacy_help.xhtml#internet_address"/>
      </rdf:li>
      <rdf:li>
-       <rdf:Description ID="privacy:P3P_levels"
-         nc:name="úrovne P3P"
-         nc:link="using_priv_help.xhtml#setting_privacy_levels"/>
-     </rdf:li>
-     <rdf:li>
-       <rdf:Description ID="privacy:P3P_standard_and"
-         nc:name="štandard P3P"
-         nc:link="page_info_help.xhtml"/>
-     </rdf:li>
-     <rdf:li>
        <rdf:Description ID="privacy:preferences"
          nc:name="nastavenia súkromia"
          nc:link="privsec_help.xhtml"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="privacy:protecting"
          nc:name="ochrana vášho súkromia"
          nc:link="privacy_help.xhtml#using_privacy_features"/>
      </rdf:li>
      <rdf:li>
-       <rdf:Description ID="privacy:settings"
-         nc:name="nastavenia súkromia"
-         nc:link="using_priv_help.xhtml#privacy_settings"/>
-     </rdf:li>
-     <rdf:li>
        <rdf:Description ID="privacy:viewing_site_policy"
          nc:name="zobrazenie zásad stránok"
          nc:link="page_info_help.xhtml"/>
      </rdf:li></rdf:Seq>
    </nc:subheadings>
 </rdf:Description>
 
 <rdf:Description about="#profiles">
--- a/suite/chrome/common/help/nav_help.xhtml
+++ b/suite/chrome/common/help/nav_help.xhtml
@@ -868,55 +868,25 @@ Súbor a kliknúť na položku Nastavenie tlače.</p>
 
 <p>Veľa autorov internetových stránok používa vlastné písmo a veľkosť. Keď chcete toto nastavenie písma používať, označte 
   voľbu <q>Povoliť dokumentom používať iného písma</q></p>
 
 <p>[<a href="#using_languages_and_international_content">Návrat na začiatok kapitoly</a>]</p>
 
 <h2 id="setting_language_preferences">Nastavenie predvolieb jazyka</h2>
 
-<p>Jazyk nastavený pre aplikáciu &brandShortName; ovplyvňuje texty na tlačidlách, v dialógových oknách, ponuke, paneloch 
-  nástrojov a iných miestach. Funkčnosť týchto položiek sa nemení.</p>
-
-<p>Ak chcete zmeniť jazyk aplikácie &brandShortName;:</p>
-
-<ol>
-  <li>Otvorte ponuku <span class="mac">&brandShortName;</span><span class="noMac">Upraviť</span> a kliknite na položku 
-    Možnosti.</li>
-  <li>V kategórii Vzhľad kliknite na podkategóriu Jazyky. (Pokiaľ nevidíte žiadnu podkategóriu, dvojitím kliknutím na položku 
-    Vzhľad zobrazíte ich zoznam.)</li>
-  <li>V sekcii <q>Nainštalované jazyky</q> si vyberte jazykový balíček.</li>
-  <li>Kliknite na tlačidlo OK.
-
-  <p><strong>Poznámka</strong>: Zmeny v nastavení jazyka sa prejavia až po reštarte aplikácie &brandShortName;.</p>
-  
-  </li>
-</ol>
-
-<p><strong>Tip</strong>: Ak si chcete prevziať viac jazykových balíkov, kliknite na tlačidlo Prevziať ďalšie…</p>
+<p>Jazyk nastavený pre aplikáciu &brandShortName; ovplyvňuje používateľské rozhranie &mdash; texty na tlačidlách, 
+  v dialógových oknách, ponuke, paneloch nástrojov a iných miestach.
+  Jazykové balíky si môžete prevziať a nainštalovať na stránke
+  <a href="http://www.seamonkey-project.org/releases/">projektu SeaMonkey</a>, po inštalácii je potrebné prepnúť jazyk
+  <a href="cs_nav_prefs_appearance.xhtml#appearance">v nastaveniach programu v sekcii Vzhľad</a>.</p>
 
-<p>Niektoré webové stránky sú k dispozícii vo viacerých jazykoch. &brandShortName; zobrazí stránky v jazyku, ktorý 
-  uprednostňujete, ak je k dispozícii. Môžete si nastaviť jazyky, ktoré preferujete ako aj ich poradie.</p>
-
-<p>Nastavenie preferovaných jazykov:</p>
-
-<ol>
-  <li>Otvorte ponuku <span class="mac">&brandShortName;</span><span class="noMac">Upraviť</span> a kliknite na položku 
-    Možnosti.</li>
-  <li>V kategórii Prehliadač kliknite na podkategóriu Jazyky. (Pokiaľ nevidíte žiadnu podkategóriu, dvojitým kliknutím na 
-    položku Prehliadač zobrazíte ich zoznam.)</li>
-  <li>Kliknite na tlačidlo Pridať… Zobrazí sa dialógové okno Pridať jazyky.</li>
-  <li>Vyberte jazyk a jeho kód. Keď chcete pridať kód, ktorý nie je v zozname, zadajte ho do poľa Ďalšie: (viď poznámka nižšie). 
-    Ak chcete zmeniť poradie jazykov v zozname, označte jazyk a kliknite na tlačidlo Posunúť nahor alebo Posunúť nadol.</li>
-  <li>Kliknite na tlačidlo OK.</li>
-</ol>
-
-<p><strong>Poznámka</strong>: Kódy jazykov tvorené dvoma písmenami, ktoré sú uzatvorené v zátvorkách, sa pridávajú do zoznamu 
-  k jednotlivým jazykom. Sú to štandardizované kódy jazykov, ich zoznam nájdete v online dokumente 
-  <a href="http://www.loc.gov/standards/iso639-2/langcodes.html">Reprezentačné kódy mien jazykov</a> [EN].</p>
+<p>Niektoré webové stránky sú dostupné vo viacerých jazykoch. V paneli nastavení
+  <a href="cs_nav_prefs_navigator.xhtml#languages">Jazyky</a> si môžete nastaviť, v akom jazyku má &brandShortName; tieto
+  stránky zobrazovať. Môžete určiť aj viac jazykov, pričom preferecia jazykov je nastavená zhora nadol.</p>
   
 <p>[<a href="#using_languages_and_international_content">Návrat na začiatok kapitoly</a>]</p>
 
 <h2 id="finding_localized_version">Rôzne jazykové verzie &brandShortName;</h2>
 
 <p>Ak hľadáte verziu &brandShortName; vo svojom jazyku, môžete ju prevziať zo stránky 
   <a href="http://www.mozilla.org/projects/seamonkey/releases/">SeaMonkey Project Releases</a> [EN]</p>
 
--- a/suite/chrome/common/help/page_info_help.xhtml
+++ b/suite/chrome/common/help/page_info_help.xhtml
@@ -23,19 +23,16 @@
   Informácie o stránke. Ak máte záujem o určité druhy informácií, kliknite na kartu s vami požadovanou ponukou.</p>
 
 <p>Väčšina z informácií zobrazených v jednotlivých kartách (Všeobecné, Formuláre, Odkazy a Médiá), je prevzatá zo 
   zdrojového kódu stránky. Tieto veci zvyčajne zaujímajú len webových vývojárov a ostatných odborníkov.</p>
 
 <p>Viac detailov o kóde HTML, vrátane značiek nachádzajúcich sa v dialógovom okne Informácie o stránke, nájdete na 
   stránke <a href="http://www.w3.org/TR/REC-html40/">Špecifikácia HTML 4.01</a> [EN].</p>
 
-<p>Karty Súkromie a Bezpečnosť obsahujú informácie o z8sad8ch <a href="glossary.xhtml#p3p">Platform for
-  Privacy Preferences (P3P)</a> a stave zabezpečenia webovej stránky, ktorú si prezeráte.</p>
-
 <div class="contentsBox">V tejto kapitole:
   <ul>
     <li><a href="#general_tab">Karta Všeobecné</a></li>
     <li><a href="#forms_tab">Karta Formuláre</a></li>
     <li><a href="#links_tab">Karta Odkazy</a></li>
     <li><a href="#media_tab">Karta Médiá</a></li>
     <li><a href="#privacy_tab">Karta Súkromie</a></li>
     <li><a href="#security_tab">Karta Bezpečnosť</a></li>
--- a/suite/chrome/common/help/privacy_help.xhtml
+++ b/suite/chrome/common/help/privacy_help.xhtml
@@ -16,22 +16,16 @@
 
 <h1 id="using_privacy_features">Using Privacy Features</h1>
 
 <p>Your browser includes features you can use to enhance the privacy and
   security of your personal information. The sections that follow describe how
   your browser can help you control cookies, passwords, forms, and images while
   you are surfing the Internet.</p>
 
-<p>Some web sites publish their privacy policies according to the Platform for
-  Privacy Preferences (P3P) standard. For information on how to customize your
-  browser based on this standard, see
-  <a href="using_priv_help.xhtml#setting_privacy_levels">Setting Privacy
-  Levels</a>.</p>
-
 <p>For information about related &brandShortName; security features, see
   <a href="mail_sec_help.xhtml">Signing &amp; Encrypting Messages</a> and
   <a href="using_certs_help.xhtml">Using Certificates</a>.</p>
 
 <div class="contentsBox">Privacy topics:
   <ul>
     <li><a href="#privacy_on_the_internet">Privacy on the Internet</a></li>
     <li><a href="using_priv_help.xhtml#using_the_cookie_manager">Using the
@@ -126,38 +120,28 @@
 <p>Later, when you return to the site, your browser sends back the cookies that
   belong to the site.</p>
   
 <p>When you are using the default cookie settings, this activity is invisible
   to you, and you won&apos;t know when a site is setting a cookie or when your
   browser is sending a web site&apos;s cookie back. However, you can set your
   preferences so that you will be asked before a cookie is set. For information
   on how to do this, see
-  <a href="using_priv_help.xhtml#setting_privacy_levels">Setting Privacy
-  Levels</a>.</p>
+  <a href="using_priv_help.xhtml#cookies">Privacy &amp; Security Preferences -
+    Cookies</a>.</p>
   
 <h3>How Do Sites Use Cookie Information?</h3>
 
 <p>Cookies allow a site to know something about your previous visits. For
   example, if you typically search for local weather or purchase books at a web
   site, the site may use cookies to remember what city you live in or what
   authors you like, so it can make your next visit easier and more useful.</p>
 
-<p>Many web sites publish privacy policies that describe how they use the
-  information they receive.</p>
-
-<p>You can check a web site&apos;s privacy policy to see what it says about the
-  information it collects, how that information is used, and what choices you
-  have regarding the use of that information. To learn how to do this, see
-  <a href="using_priv_help.xhtml#viewing_privacy_policies">Viewing Privacy
-  Policies</a>.</p>
-
-<p>For information on how to manage cookies with the aid of published privacy
-  policies, see <a href="using_priv_help.xhtml#setting_privacy_levels">Setting
-  Privacy Levels</a>.</p>
+<p>Some websites publish privacy policies that describe how they use the
+  information they gather.</p>
 
 <h3 id="what_are_third-party_cookies">What Are Third-Party Cookies?</h3>
 
 <p>If your browser stores a site&apos;s cookie, it will return the cookie only
   to that particular site. Your browser will not provide one site with cookies
   set by another. Since a web site can only receive its own cookies, it can
   learn about your activities while you are at that site but not your
   activities in general while surfing the Web.</p>
@@ -226,18 +210,14 @@
   <li>Will the site share the information with others and do I have choices
     regarding the use of any shared information?</li>
   <li>Can I access some or all of the information a site gathers about me, in
     order to inspect or update it?</li>
   <li>How does the site protect the information?</li>
   <li>How do I contact the web site if I have questions or problems?</li>
 </ul>
 
-<p>For information about checking a web site&apos;s privacy policy, see
-  <a href="using_priv_help.xhtml#viewing_privacy_policies">Viewing Privacy
-  Policies</a>.</p>
-
 <p>[<a href="#privacy_on_the_internet">Return to beginning of section</a>]</p>
 
 <p>&copyright.string;</p>
 
 </body>
 </html>
--- a/suite/chrome/common/help/suite-toc.rdf
+++ b/suite/chrome/common/help/suite-toc.rdf
@@ -811,29 +811,27 @@
 
 <rdf:Description about="#using-priv-help-cookies">
     <nc:subheadings>
       <rdf:Seq>
         <rdf:li><rdf:Description ID="using-priv-help-cookies-manage" nc:name="Enabling &amp; Disabling Cookies" nc:link="using_priv_help.xhtml#enabling_and_disabling_cookies"/> </rdf:li>
         <rdf:li><rdf:Description ID="using-priv-help-cookies-site" nc:name="Managing Cookies Site-By-Site" nc:link="using_priv_help.xhtml#managing_cookies_site-by-site"/> </rdf:li>
         <rdf:li><rdf:Description ID="using-priv-help-cookies-view" nc:name="Viewing Cookies" nc:link="using_priv_help.xhtml#viewing_cookies"/> </rdf:li>
         <rdf:li><rdf:Description ID="using-priv-help-cookies-remove" nc:name="Removing Cookies" nc:link="using_priv_help.xhtml#removing_cookies"/> </rdf:li>
-        <rdf:li><rdf:Description ID="using-priv-help-cookies-policies" nc:name="Setting Privacy Levels" nc:link="using_priv_help.xhtml#setting_privacy_levels"/> </rdf:li>
         <rdf:li><rdf:Description ID="using-priv-help-cookies-settings" nc:name="Cookie Manager Settings" nc:link="using_priv_help.xhtml#cookie_manager_settings"/> </rdf:li>
       </rdf:Seq>
     </nc:subheadings>
   </rdf:Description>
 
 <rdf:Description about="#using-priv-help-cookies-settings">
     <nc:subheadings>
       <rdf:Seq>
         <rdf:li><rdf:Description ID="cookies_prefs" nc:name="Cookie Preferences" nc:link="using_priv_help.xhtml#cookies"/> </rdf:li>
         <rdf:li><rdf:Description ID="cookies_stored" nc:name="Stored Cookies" nc:link="using_priv_help.xhtml#stored_cookies"/> </rdf:li>
         <rdf:li><rdf:Description ID="cookie_sites" nc:name="Cookie Sites" nc:link="using_priv_help.xhtml#cookie_sites"/> </rdf:li>
-        <rdf:li><rdf:Description ID="privacy_levels" nc:name="Privacy Settings" nc:link="using_priv_help.xhtml#privacy_settings"/> </rdf:li>
         <rdf:li><rdf:Description ID="cookie_notify" nc:name="Cookie Notification" nc:link="using_priv_help.xhtml#cookie_notification"/> </rdf:li>
 
       </rdf:Seq>
     </nc:subheadings>
   </rdf:Description>
 
 <rdf:Description about="#privacy_levels">
     <nc:subheadings>
@@ -873,17 +871,16 @@
 <rdf:Description about="#using-priv-help-forms">
     <nc:subheadings>
       <rdf:Seq>
         <rdf:li><rdf:Description ID="using-priv-help-forms-saveinfo" nc:name="Saving Form Data" nc:link="using_priv_help.xhtml#saving_form_data"/> </rdf:li>
         <rdf:li><rdf:Description ID="using-priv-help-forms-auto" nc:name="Filling Out Forms Automatically" nc:link="using_priv_help.xhtml#filling_out_forms_automatically"/> </rdf:li>
         <rdf:li><rdf:Description ID="using-priv-help-forms-notify" nc:name="Turning off Form Manager Notification" nc:link="using_priv_help.xhtml#turning_off_form_manager_notification"/> </rdf:li>
         <rdf:li><rdf:Description ID="using-priv-help-forms-view-edit" nc:name="Managing Stored Form Data" nc:link="using_priv_help.xhtml#managing_stored_form_data"/> </rdf:li>
         <rdf:li><rdf:Description ID="using-priv-help-sites-view-edit" nc:name="Editing Stored Site Information" nc:link="using_priv_help.xhtml#editing_stored_site_information"/> </rdf:li>
-        <rdf:li><rdf:Description ID="using-priv-help-forms-forms" nc:name="Viewing Privacy Policies" nc:link="using_priv_help.xhtml#viewing_privacy_policies"/> </rdf:li>
         <rdf:li><rdf:Description ID="form_settings" nc:name="Form Settings" nc:link="using_priv_help.xhtml#form_settings"/> </rdf:li>
       </rdf:Seq>
     </nc:subheadings>
   </rdf:Description>
 
 <rdf:Description about="#form_settings">
     <nc:subheadings>
       <rdf:Seq>
--- a/suite/chrome/common/help/using_certs_help.xhtml
+++ b/suite/chrome/common/help/using_certs_help.xhtml
@@ -58,18 +58,20 @@
   certificate vary depending on what you want to use it for. In some cases
   getting a certificate may be as easy as going to a website, entering some
   personal information, and automatically downloading the certificate into your
   browser. In other cases you may have to go through more complicated
   procedures.</p>
 
 <p>You can obtain a certificate today by visiting the URL for a certificate
   authority and following the on-screen instructions. For a list of certificate
-  authorities, see the online document
-  <a href="https://certs.netscape.com/">Client Certificates</a>.</p>
+  authorities issuing certificates recognized by &brandShortName;, see the
+  online document
+  <a href="http://www.mozilla.org/projects/security/certs/included/">Included
+  Certificate List</a>.</p>
 
 <p>Once you obtain a certificate, it is automatically stored in a
   <a href="glossary.xhtml#security_device">security device</a>. Your browser
   comes with its own built-in Software Security Device. A security device can
   also be a piece of hardware, such as a smart card.</p>
 
 <p>Like a driver&apos;s license or a credit card, a certificate is a valuable
   form of identification that can be abused if it falls into the wrong hands.
--- a/suite/chrome/common/help/using_priv_help.xhtml
+++ b/suite/chrome/common/help/using_priv_help.xhtml
@@ -36,17 +36,16 @@
 <div class="contentsBox">In this section:
   <ul>
     <li><a href="#enabling_and_disabling_cookies">Enabling &amp; Disabling
       Cookies</a></li>
     <li><a href="#managing_cookies_site-by-site">Managing Cookies
       Site-By-Site</a></li>
     <li><a href="#viewing_cookies">Viewing Cookies</a></li>
     <li><a href="#removing_cookies">Removing Cookies</a></li>
-    <li><a href="#setting_privacy_levels">Setting Privacy Levels</a></li>
     <li><a href="#cookie_manager_settings">Cookie Manager Settings</a></li>
   </ul>
 </div>
 
 <h2 id="enabling_and_disabling_cookies">Enabling &amp; Disabling Cookies</h2>
 
 <p>You can specify how cookies should be handled by setting your Cookies
   preferences. The default setting is <q>Allow all cookies</q>.</p>
@@ -167,106 +166,30 @@
   allow sites that set removed cookies to set future cookies</q>. When this
   checkbox is selected, sites for the cookies that you are removing are
   added to the list of sites whose cookies will automatically be rejected.</p>
 
 <p>You must click OK for your changes to take effect.</p>
 
 <p>[<a href="#using_the_cookie_manager">Return to beginning of section</a>]</p>
 
-<h2 id="setting_privacy_levels">Setting Privacy Levels</h2>
-
-<p>Many sites develop and publish their privacy policies based on the
-  Platform for Privacy Preferences (P3P) standard. The information that follows
-  applies only to sites that post a privacy policy based on the P3P standard
-  and the browser&apos;s implementation of that standard. The browser&apos;s
-  implementation may not be, in all cases, identical to the standard published
-  by the World Wide Web Consortium.</p>
-
-<p>A site&apos;s P3P privacy policy describes, in a standardized way, what
-  kind of information the site collects, to whom it gives that information, and
-  how it uses the information. For information about viewing a site&apos;s
-  privacy policy, see <a href="#viewing_privacy_policies">Viewing Privacy
-  Policies</a>.</p>
-
-<p>&brandShortName;&apos;s implementation of the P3P standard defines three
-  levels of privacy: low, medium, and high (the default is medium). You can
-  select one of these predefined privacy levels, or you can specify your own
-  custom privacy settings in detail. Once you have set your preferred privacy
-  level, your browser can compare your preferences with the site&apos;s P3P
-  policy (if any) and accept or reject cookies accordingly.</p>
-
-<p>For example, your privacy settings may require the browser to reject cookies
-  that collect personal information without informing you. Alternatively, you
-  can adjust your privacy settings so that the browser simply warns you when a
-  cookie is used in this way, while allowing the action to take place.</p>
-
-<p>To control the privacy settings you want your browser to enforce for all
-  sites:</p>
-
-<ol>
-  <li>Open the <span class="mac">&brandShortName;</span>
-    <span class="noMac">Edit</span> menu and choose Preferences.</li> 
-  <li>Under the Privacy &amp; Security category, click Cookies. (If no
-    subcategories are visible, double-click Privacy &amp; Security to expand
-    the list.)</li>
-  <li>Select the option labeled <q>Allow cookies based on privacy
-    settings</q>.</li>
-  <li>Click View.</li>
-  <li>In the Privacy Settings dialog box, select the level of privacy you want,
-    or select <q>custom</q> and specify your own privacy settings as
-    discussed below.</li>
-  <li>Click OK to confirm your settings.</li>
-</ol>
-
-<p>Your browser handles cookies according to the settings you select. If you do
-  not select a preferred setting, the browser defaults to medium. The low,
-  medium, and high options are predefined by &brandShortName;. For more
-  information about these predefined options, see
-  <a href="#privacy_settings">Privacy Settings</a>.</p>
-
-<p>When the <q>custom</q> option is selected, you can specify your own
-  privacy settings in detail. Depending on the P3P policy of the site setting
-  the cookie, and depending on whether or not the site setting the cookie is
-  the one you are viewing, you can select whether you want the Cookie Manager
-  to accept the cookie, reject it, accept it just for the current session (that
-  is, until you exit the browser), or flag it.</p>
-
-<p>If you choose Reject, Flag, or Session for a given category of cookies, the
-  Cookie Manager displays the cookie notification icon
-  (<img alt="cookie notification icon"
-  src="chrome://communicator/skin/permissions/taskbar-cookie.gif"/>)
-  near the lower-right corner of the browser window whenever a site that
-  fits the category sets a cookie. When this icon is displayed, you can click
-  it to get information about the affected cookies.</p>
-
-<p><q>First party cookies</q> are cookies set by the site you are
-  visiting. <q>Third-party cookies</q>, also known as
-  <a href="privacy_help.xhtml#what_are_third-party_cookies">foreign cookies</a>,
-  are set by sites other than the one you are viewing.</p>
-
-<p>For more details, see <a href="#privacy_settings">Privacy Settings</a>.</p>
-
-<p>[<a href="#using_the_cookie_manager">Return to beginning of section</a>]</p>
-
 <h1 id="cookie_manager_settings">Cookie Manager Settings</h1>
 
 <p>This section describes how to set your Cookies preferences and control other
   aspects of cookie handling.</p>
 
 <p>For step-by-step descriptions of various tasks related to cookies, see
   <a href="#using_the_cookie_manager">Using the Cookie Manager</a>.</p>
 
 <div class="contentsBox">In this section:
   <ul>
     <li><a href="#cookies">Privacy &amp; Security Preferences -
       Cookies</a></li>
     <li><a href="#stored_cookies">Stored Cookies</a></li>
     <li><a href="#cookie_sites">Cookie Sites</a></li>
-    <li><a href="#privacy_settings">Privacy Settings</a></li>
     <li><a href="#cookie_notification">Cookie Notification</a></li>
   </ul>
 </div>
 
 <h2 id="cookies">Privacy &amp; Security Preferences - Cookies</h2>
 
 <p>Your browser is set by default to accept all cookies. This section describes
   how to use the Cookies preferences panel to change that setting. If
@@ -290,20 +213,16 @@
 
 <ul>
   <li><strong>Block cookies</strong>: Select this option to refuse all
     cookies.</li>
   <li><strong>Allow cookies for the originating website only</strong>: Select
     this option if you don&apos;t want to accept or return
     <a href="privacy_help.xhtml#what_are_third-party_cookies">foreign
     cookies</a>.</li>
-  <li><strong>Allow cookies based on privacy settings</strong>: Select this
-    option if you handle cookies based on your privacy settings. If you select
-    this option, click the View Privacy Settings button to confirm or modify
-    your privacy settings.</li>
   <li><strong>Allow all cookies</strong>: This is the default option. Select
     this option to permit all sites not explicitly blocked to set cookies on
     your computer.</li>
 </ul>
 
 <p><strong>Note</strong>: Blocking cookies does not remove old cookies. By
   blocking cookies you only block sites from setting new cookies, and old
   cookies will still be sent to sites. To completely block a site from receiving
@@ -331,17 +250,17 @@
     In addition, you can choose <strong>except for session cookies</strong>: so
     that &brandShortName; will not warn you if the site is setting cookies
     which will be deleted when you exit your browser.</li>
 </ul>
 
 <p>You can also get more information about your stored cookies:</p>
 
 <ul>
-  <li><strong>Manage Stored Cookies</strong>: Click this button to view
+  <li><strong>Cookie Manager</strong>: Click this button to view
     information about the cookies currently stored on your computer and which
     sites are allowed to set them.</li>
 </ul>
 
 <h2 id="stored_cookies">Stored Cookies</h2>
 
 <p>This section describes how to use the Stored Cookies tab of the Cookie
   Manager. If you&apos;re not already viewing it, follow these steps:</p>
@@ -350,21 +269,16 @@
   <li>Open the Tools menu and choose Cookie Manager.</li>
   <li>Choose Manage Stored Cookies from the submenu. The Cookie Manager window
     opens with a list of all the cookies stored on your computer.</li>
 </ol>
 
 <p>The Stored Cookies tab lists all the cookies stored on your computer, the
   sites they belong to, and their current status.</p>
 
-<p>If you can&apos;t see the Status column, click the icon in the upper-right
-  corner of the table and select Status. This column indicates which cookies
-  have been flagged or accepted according to your
-  <a href="#privacy_settings">Privacy Settings</a>.</p>
-
 <p>When you select a cookie in this list, the following information about that
   cookie appears in the bottom portion of the tab:</p>
 
 <table class="defaultTable">
   <thead>
     <tr>
       <th>Item</th>
       <th>Explanation</th>
@@ -490,175 +404,16 @@
   <li><strong>Remove All Sites</strong>: Removes all sites from the list.</li>
 </ul>
 
 <p>Once you&apos;ve removed a site from this list, Cookie Manager remembers
   nothing about it. If the <q>Ask for each cookie</q> option is selected in
   the Cookies preferences panel, you will be warned when any site not in this
   list requests permission to set a cookie.</p>
 
-<h2 id="privacy_settings">Privacy Settings</h2>
-
-<p>This section describes how to use the Privacy Settings window. If
-  you&apos;re not already viewing it, follow these steps:</p>
-
-<ol>
-  <li>Open the <span class="mac">&brandShortName;</span>
-    <span class="noMac">Edit</span> menu and choose Preferences.</li>
-  <li>Under the Privacy &amp; Security category, click Cookies. (If no
-    subcategories are visible, double-click Privacy &amp; Security to expand
-    the list.)</li>
-  <li>Select the radio button labeled <q>Allow cookies based on privacy
-    settings</q>.</li>
-  <li>Click View Privacy Settings.</li>
-</ol>
-
-<p>For more information about using privacy settings, see
-  <a href="#setting_privacy_levels">Setting Privacy Levels</a>.</p>
-
-<div class="contentsBox">In this section:
-  <ul>
-    <li><a href="#level_of_privacy">Level of Privacy</a></li>
-    <li><a href="#cookie_acceptance_policy">Cookie Acceptance Policy</a></li>
-  </ul>
-</div>
-
-<h3 id="level_of_privacy">Level of Privacy</h3>
-
-<p>The level of privacy you set here determines how your browser treats cookies
-  according to privacy policies based on the P3P standard that published by
-  some sites and on the settings displayed under Cookie Acceptance Policy
-  for first-party and third-party cookies.</p>
-
-<p><q>First party cookies</q> are cookies set by the site you are
-  visiting. <q>Third-party cookies</q>, also known as
-  <a href="privacy_help.xhtml#what_are_third-party_cookies">foreign
-  cookies</a>, are set by sites other than the one you are viewing.</p>
-
-<p>You can select one of the following privacy levels:</p>
-
-<ul>
-  <li><strong>low</strong>: Select this if you want to accept all first-party
-    cookies without regard to a site&apos;s privacy policy. 
-
-    <p>When this setting is selected, the browser accepts all third-party
-      cookies, but <strong>flags</strong> third-party cookies from sites that
-      indicate they may collect personally identifiable information without
-      your consent. Flagged cookies are listed as <q>flagged</q> in the
-      status column of the Cookie Manager&apos;s
-      <a href="#stored_cookies">Stored Cookies</a> tab.</p>
-
-    <p>When a cookie is first flagged, the Cookie Manager displays the cookie
-      notification icon (<img alt="cookie notification icon"
-      src="chrome://communicator/skin/permissions/taskbar-cookie.gif"/>) near
-      the lower-right corner of the browser window (if it&apos;s not already
-      present). You can click the cookie notification icon to see more detailed
-      information about the flagged cookies.</p>
-
-  </li>
-  <li><strong>medium</strong>: Select this if you want to accept and flag both
-    first-party and third-party cookies set by sites that may be collecting
-    personally identifiable information without your consent. This is the
-    default setting.</li>
-  <li><strong>high</strong>: Select this if you want the same settings as
-    medium, with the following differences:
-    <ul>
-      <li>Reject third-party cookies set by sites that may be collecting
-        information without your consent that can be used to identify you.</li>
-      <li>Accept, for the current session only, third-party cookies that may be
-        collecting information without your consent that can be used to
-        identify you, but also provide a web page or some other mechanism that
-        allows you to withhold your consent.</li>
-    </ul>
-  </li>
-  <li><strong>custom</strong>: Select this if you want to set your own custom
-    Cookie Acceptance Policy. The default settings for <q>custom</q> are
-    whatever they happened to be just before you select this option. You can
-    modify them by selecting from the drop-down menus in the Cookie Acceptance
-    Policy portion of the dialog box.</li>
-</ul>
-
-<p>To see the exact effect of each privacy-level setting, select it and then
-  examine the Cookie Acceptance Policy settings.</p>
-
-<h3 id="cookie_acceptance_policy">Cookie Acceptance Policy</h3>
-
-<p>If you select the <strong>custom</strong> option in the top portion of the
-  Privacy Settings dialog box, you can choose one of four settings from the
-  drop-down list in each of the eight categories shown in the bottom portion.
-  These settings cause Cookie Manager to perform the following actions:</p>
-
-<ul>
-  <li><strong>Accept</strong>: Accept all cookies in the category.</li>
-  <li><strong>Session</strong>: Accept all cookies in the category for the
-    current session only&mdash;that is, until you exit the browser.</li>
-  <li><strong>Reject</strong>: Reject all cookies in the category.</li>
-  <li><strong>Flag</strong>: Lists the cookie&apos;s status as
-    <q>flagged</q> in the status column of the Cookie Manager&apos;s
-    <a href="#stored_cookies">Stored Cookies</a> tab and display the cookie
-    notification icon.</li>
-</ul>
-
-<p>The cookie notification icon (<img alt="cookie notification icon"
-  src="chrome://communicator/skin/permissions/taskbar-cookie.gif"/>) appears
-  near the lower-right corner of the browser window. You can click it to get
-  information about the affected cookies or modify your privacy settings.</p>
-
-<p>Sites are classified in four categories for each of the two types
-  (first-party and third-party) of cookies:</p>
-
-<ul>
-  <li><strong>Site has no privacy policy</strong>: Site does not publish any
-    kind of privacy policy. There is no way of knowing what kinds of
-    information such sites collect or what they do with it.</li>
-  <li><strong>Site collects personally identifiable information without your
-    consent</strong>: Site publishes a privacy policy, but does not ask your
-    permission when it collects personally identifiable information.</li>
-  <li><strong>Site collects personally identifiable information with only your
-    implicit consent</strong>: Site collects information about you unless you
-    go to a web page (or use some other designated mechanism) to explicitly
-    withhold your consent (opt-out).</li>
-  <li><strong>Site does not collect personally identifiable information without
-    your explicit consent</strong>: Sites will not collect personally
-    identifiable information unless you have explicitly agreed (opt-in).</li>
-</ul>
-
-<h2 id="cookie_notification">Cookie Notification</h2>
-
-<p>The cookie notification icon (<img alt="cookie notification icon"
-  src="chrome://communicator/skin/permissions/taskbar-cookie.gif"/>) is
-  displayed in the status bar near the lower-right corner of the browser
-  window. It appears when a site has used a cookie in a way that requires you
-  to be notified according to your current <a href="#privacy_settings">Privacy
-  Settings</a>.</p>
-
-<p>This section describes how to use the Cookie Notification dialog box, which
-  appears when you click the Cookie Notification icon. You can take the
-  following actions from this dialog box:</p>
-
-<ul>
-  <li><strong>Turn Off Privacy Settings</strong>: Click this button to disable
-    your Privacy Settings. This has the same effect as selecting <q>Enable
-    all cookies</q> in <a href="#cookies">Privacy &amp; Security
-    Preferences - Cookies</a>. After you take this action, your browser will
-    accept all cookies.</li>
-  <li><strong>View Cookie Manager</strong>: Click this button to open the
-    Cookie Manager, where you can view the current status of all your cookies
-    and identify the cookies that caused the notification icon to appear.</li>
-  <li><strong>View Privacy Settings</strong>: Click this button to open the
-    Privacy Settings dialog box. The settings in this dialog box determine how
-    sites can use cookies on your computer and what actions cause the cookie
-    notification icon to be displayed.</li>
-  <li><strong>Close</strong>: Click this button to exit the Cookie Notification
-    dialog box without taking any action.</li>
-</ul>
-
-<p>For more information about using privacy settings, see
-  <a href="#setting_privacy_levels">Setting Privacy Levels</a>.</p>
-
 <h1 id="using_the_password_manager">Using the Password Manager</h1>
 
 <p>Many sites require you to type a user name and password before you can
   enter the site. For instance, personalized pages and sites containing your
   financial information usually require you to log in.</p>
 
 <p>The user name and password you use at a particular site can be read by the
   site&apos;s administrator. Potentially, that person could then attempt to log
@@ -844,17 +599,16 @@
     <li><a href="#saving_form_data">Saving Form Data</a></li>
     <li><a href="#filling_out_forms_automatically">Filling Out Forms
       Automatically</a></li>
     <li><a href="#turning_off_form_manager_notification">Turning Off Form
       Manager Notification</a></li>
     <li><a href="#managing_stored_form_data">Managing Stored Form Data</a></li>
     <li><a href="#editing_stored_site_information">Editing Stored Site
       Information</a></li>
-    <li><a href="#viewing_privacy_policies">Viewing Privacy Policies</a></li>
     <li><a href="#form_settings">Form Settings</a></li>
   </ul>
 </div>
 
 <h2 id="saving_form_data">Saving Form Data</h2>
 
 <p>By default, when you fill out an online form and click Submit, Form Manager
   detects the form and displays a dialog box asking if you want to save the
@@ -1070,79 +824,16 @@
 </ul>
 
 <p>To remove a site from either list and thus restore the default behavior,
   select the site and click Remove. For more details, see
   <a href="#form_manager_sites">Form Manager - Sites</a>.</p>
 
 <p>[<a href="#using_the_form_manager">Return to beginning of section</a>]</p>
 
-<h2 id="viewing_privacy_policies">Viewing Privacy Policies</h2>
-
-<p>When you provide personal information such as your name, phone number, or
-  email address to a site, or when the site collects personal information in
-  other ways, the site can use the information for its own purposes (such as
-  shipping you a product or customizing your browsing experience) and can
-  potentially share it with others.</p>
-
-<p>Before providing personal information on an online form, you must decide
-  whether or not you trust the site&mdash;just as you judge whether or not
-  you trust a catalog company before you provide your credit card number on the
-  company&apos;s order form.</p>
-
-<p>One way to evaluate a site&apos;s trustworthiness is to examine its
-  published privacy policy. Sites publish privacy statements online, and
-  some of them publish such statements based on the Platform for Privacy
-  Preferences (P3P) standard and the browser&apos;s implementation of that
-  standard.</p>
-
-<p>A site&apos;s privacy policy describes what kind of information the site
-  collects, to whom it gives that information, and how it uses the information.
-  Sites publish privacy policies in both human-readable form and as a file
-  that can be interpreted by the browser according to your
-  <a href="#privacy_settings">Privacy Settings</a>.</p>
-
-<p>To view a site&apos;s privacy policy, browse to the site and follow these
-  steps:</p>
-
-<ul>
-  <li>Open the View menu and choose Page Info. The Page Info window
-    appears.</li>
-  <li>Click the Privacy tab.</li>
-  <li>Click these buttons to see the corresponding information:
-    <ul>
-      <li><strong>Policy</strong>: Click this button to view the site&apos;s
-        published privacy policy on the web.</li>
-      <li><strong>Summary</strong>: Click this button to view a summary of the
-        site&apos;s built-in XML policy file, which defines the site&apos;s
-        policies in detail.</li>
-      <li><strong>Options</strong>: Click this button to view a web page
-        provided by the site where you can choose to withhold or grant your
-        consent to certain kinds of information gathering.</li>
-    </ul>
-  </li>
-</ul>
-
-<p>Many web pages are made up of a variety of text, images, advertisements, and
-  other elements, some of which may be controlled by different companies.</p>
-
-<p>To view the same information for any individual element of the web page:</p>
-
-<ol>
-  <li>Double-click the categories to see addresses for individual
-    components.</li>
-  <li>Select the component whose privacy policy you want to examine.</li>
-  <li>Click the buttons as described above.</li>
-</ol>
-
-<p>For more information on controlling your privacy, see
-  <a href="#setting_privacy_levels">Setting Privacy Levels</a>.</p>
-
-<p>[<a href="#using_the_form_manager">Return to beginning of section</a>]</p>
-
 <h1 id="form_settings">Form Settings</h1>
 
 <p>When you fill out an online form, Form Manager normally detects the form
   and, when you click Submit, gives you an opportunity to save the data you
   entered.</p>
 
 <p>This section describes the preferences and other settings that control the
   way Form Manager works.</p>
--- a/suite/chrome/common/help/validation_help.xhtml
+++ b/suite/chrome/common/help/validation_help.xhtml
@@ -68,55 +68,54 @@
   <a href="using_certs_help.xhtml#managing_crls">Managing CRLs</a>.</p>
 
 <h3 id="ocsp">OCSP</h3>
 
 <p>The Online Certificate Status Protocol (OCSP) makes it possible for
   Certificate Manager to perform an online check of a certificate&apos;s
   validity each time the certificate is viewed or used. This process involves
   checking the certificate against a certificate revocation list (CRL)
-  maintained at a specified website. Your computer must be online for OCSP to
+  maintained at a specified server. Your computer must be online for OCSP to
   work.</p>
 
 <p>To specify how Certificate Manager uses OCSP, choose one of these settings
   in the OCSP section of Validation Settings:</p>
 
 <ul>
-  <li><strong>Do not use OCSP for certificate verification</strong>: Select
-    this setting if you don&apos;t want Certificate Manager to perform an
-    online status check each time it verifies a certificate. Instead, whenever
-    Certificate Manager performs
-    <a href="glossary.xhtml#certificate_verification">certificate
-    verification</a>, it only confirms the certificate&apos;s validity period
-    and that it is correctly signed by a CA whose own CA certificate is both
-    listed under the CA Certificates tab (in the main Certificate Manager
-    window) and marked as trusted for issuing that kind of certificate.</li>
-  <li><strong>Use OCSP to verify only certificates that specify an OCSP service
-    URL</strong>: Select this setting if you want Certificate Manager perform
-    an online status check each time it verifies a certificate that specifies a
-    URL for the purpose of performing such a check. If a URL is specified by
-    the certificate, Certificate Manager makes sure that the certificate is
-    listed there as valid and checks the validity period and trust
-    settings.</li>
-  <li><strong>Use OCSP to verify all certificates, using the URL and signer
-    specified here</strong>: Select this setting if you want Certificate
-    Manager to perform an online status check each time it verifies any
-    certificate. If you select this setting, you should also choose the
-    certificate from the Response Signer pop-up menu that identifies the signer
-    of the OCSP responses. With this setting, the only certificates Certificate
-    Manager recognizes are those that can be verified by an OCSP response
-    signed with the Response Signer certificate (or signed using a certificate
-    that chains to it).
+  <li><strong>Use the Online Certificate Status Protocol (OCSP) to confirm the
+    current validity of certificates</strong>: Select this setting if you want
+    Certificate Manager to perform an online status check each time it verifies
+    a certificate. If this setting is off, Certificate Manager will only
+    confirm the certificate&apos;s validity period and that it is correctly
+    signed by a CA whose own CA certificate is both listed under the CA
+    Certificates tab (in the main Certificate Manager window) and marked as
+    trusted for issuing that kind of certificate.</li>
+  <li><strong>Validate a certificate if it specifies a OCSP server</strong>:
+    Select this setting for online validation of certificates that provides a
+    validation service address (Service URL). Certificate Manager makes sure
+    that the certificate is listed as valid at the URL and checks validity
+    period and trust settings.</li>
+  <li><strong>Validate all certificates using the following OSCP
+    server</strong>: Select this setting if you want to specify a OCSP server
+    for the validation of all certificates. If you select this setting, you
+    should also choose the certificate from the Response Signer pop-up menu
+    that identifies the signer of the OCSP responses. With this setting, the
+    only certificates Certificate Manager recognizes are those that can be
+    verified by an OCSP response signed with the Response Signer certificate
+    (or signed using a certificate that chains to it).
 
     <p>When you choose a Response Signer certificate from the pop-up menu,
       Certificate Manager fills in the Service URL (if available) for that
       signer automatically. If the Service URL is not filled in automatically,
       you must provide it yourself; ask your system administrator for
       details.</p>
   </li>
+  <li><strong>When an OCSP server connection fails, treat the certificate as
+    invalid</strong>: Select this if you want the validation to fail if a
+    connection to the OCSP server can&apos;t be established.</li>
 </ul>
 
 <h2 id="manage_crls">Manage CRLs</h2>
 
 <p>This section describes how to use the Manage CRLs dialog box. To view it,
   follow these steps:</p>
 
 <ol>
--- a/suite/chrome/common/notification.properties
+++ b/suite/chrome/common/notification.properties
@@ -16,8 +16,21 @@ popupWarningButton.accesskey=M
 xpinstallHostNotAvailable=neznámy server
 xpinstallPromptWarning=%S zabránil tejto stránke (%S) v inštalácii softvéru, aby ochránil váš počítač.
 xpinstallPromptInstallButton=Nainštalovať…
 xpinstallPromptInstallButton.accesskey=i
 xpinstallDisabledMessageLocked=Inštalácia softvéru je vypnutá administrátorom vášho 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=P
+
+# Geolocation UI
+# LOCALIZATION NOTE (exactLocation, neighborhoodLocation): These do not have to be
+# exact value, instead approximations would be fine.
+# examples: Neighborhood (within 2 km)
+#
+geolocation.requestMessage=Stránka %S chce vedieť, kde sa nachádzate. Môžete uviesť:
+geolocation.exactLocation=Presná poloha (presnosť 3 m)
+geolocation.exactLocationKey=e
+geolocation.neighborhoodLocation=Približná poloha (presnosť na 2 km)
+geolocation.neighborhoodLocationKey=r
+geolocation.nothingLocation=Nič
+geolocation.nothingLocationKey=N
--- a/suite/chrome/mailnews/messenger.dtd
+++ b/suite/chrome/mailnews/messenger.dtd
@@ -362,22 +362,22 @@
 <!ENTITY forwardAsInline.accesskey "S">
 <!ENTITY forwardAsAttachmentCmd.label "Príloha">
 <!ENTITY forwardAsAttachmentCmd.accesskey "P">
 <!ENTITY editMsgAsNewCmd.label "Upraviť správu ako novú">
 <!ENTITY editMsgAsNewCmd.accesskey "U">
 <!ENTITY editMsgAsNewCmd.key "e">
 <!ENTITY createFilter.label "Vytvoriť filter zo správy…">
 <!ENTITY createFilter.accesskey "f">
-<!ENTITY moveMsgMenu.label "Presunúť">
-<!ENTITY moveMsgMenu.accesskey "r">
+<!ENTITY moveMsgToMenu.label "Presunúť do">
+<!ENTITY moveMsgToMenu.accesskey "r">
 <!ENTITY copyMessageLocation.label "Kopírovať adresu správy">
 <!ENTITY copyMessageLocation.accesskey "s">
-<!ENTITY copyMsgMenu.label "Skopírovať">
-<!ENTITY copyMsgMenu.accesskey "k">
+<!ENTITY copyMsgToMenu.label "Skopírovať do">
+<!ENTITY copyMsgToMenu.accesskey "k">
 <!ENTITY moveCopyMsgRecentMenu.label "Naposledy použité">
 <!ENTITY moveCopyMsgRecentMenu.accesskey "N">
 <!ENTITY killThreadMenu.label "Ignorovať vlákno">
 <!ENTITY killThreadMenu.accesskey "I">
 <!ENTITY killThreadMenu.key "k">
 <!ENTITY killSubthreadMenu.label "Ignorovať podvlákno">
 <!ENTITY killSubthreadMenu.accesskey "d">
 <!ENTITY killSubthreadMenu.key "k">
--- a/suite/chrome/mailnews/pref/AccountWizard.dtd
+++ b/suite/chrome/mailnews/pref/AccountWizard.dtd
@@ -99,17 +99,17 @@
 
 <!-- Entities for Account name page -->
 
 <!ENTITY accnameTitle.label "Názov účtu">
 <!-- LOCALIZATION NOTE (accnameDesc.label) : do not translate any "&quot;" in below line -->
 <!ENTITY accnameDesc.label "Zadajte názov tohto účtu (napr. &quot;Osobná pošta&quot;, &quot;Práca&quot;, &quot;Diskusia&quot;…).">
 <!ENTITY accnameExample.label "Napríklad Domáci účet, Pracovný účet alebo Diskusný účet">
 <!ENTITY accnameLabel.label "Názov účtu:">
-<!ENTITY accnameLabel.accesskey "N">
+<!ENTITY accnameLabel.accesskey "z">
 
 <!-- Entities for Done (Congratulations) page -->
 
 <!ENTITY completionTitle.label "Gratulujeme!">
 <!ENTITY completionText.label "Skontrolujte správnosť nasledujúcich informácií.">
 <!ENTITY serverTypePrefix.label "Typ servera pre príjem pošty:">
 <!ENTITY serverNamePrefix.label "Názov servera pre príjem pošty:">
 <!ENTITY smtpServerNamePrefix.label "Názov servera pre odosielanie pošty (SMTP):">
--- a/suite/chrome/mailnews/pref/pref-notifications.dtd
+++ b/suite/chrome/mailnews/pref/pref-notifications.dtd
@@ -32,17 +32,17 @@
  and other provisions required by the GPL or the LGPL. If you do not delete
  the provisions above, a recipient may use your version of this file under
  the terms of any one of the MPL, the GPL or the LGPL.
 
  ***** END LICENSE BLOCK ***** -->
 
 <!ENTITY pref.notifications.title         "Notifikácie">
 <!ENTITY notifications.caption            "Notifikácie">
-<!ENTITY newMessagesArrive.label          "Keď príde nová správa:">
+<!ENTITY newMessagesArrive.label          "Pri prijatí novej správy:">
 <!ENTITY playSound.label                  "Prehrať zvuk">
 <!ENTITY playSound.accesskey              "h">
 <!ENTITY showAnimatedAlert.label          "Zobraziť upozornenie">
 <!ENTITY showAnimatedAlert.accesskey      "b">
 <!ENTITY showTrayIcon.label               "Zobraziť ikonu v systémovom paneli (veľa hodín)">
 <!ENTITY showTrayIcon.accesskey           "Z">
 <!ENTITY bounceSystemDockIcon.label       "Animovať ikonu v docku">
 <!ENTITY bounceSystemDockIcon.accesskey   "A">
--- a/suite/chrome/mailnews/pref/prefs.properties
+++ b/suite/chrome/mailnews/pref/prefs.properties
@@ -25,17 +25,17 @@ failedDuplicateAccount=Nepodarilo sa vytvoriť duplikát tohto účtu
 confirmRemoveAccount=Naozaj chcete odstrániť účet "%S"?
 confirmRemoveAccountTitle=Odstránenie účtu
 #LOCALIZATION NOTE: accountName: %1$S is server name, %2$S is user name
 accountName=%1$S - %2$S
 
 confirmDeferAccount=Pokiaľ uložíte novú poštu tohto účtu do priečinka Doručená pošta iného účtu, nebude už prístup k predtým prevzatej pošte tohto účtu možný. Ak máte na tomto účte nejakú poštu, skopírujte ju najprv na druhý účet. Ak máte vytvorené filtre, ktoré filtrujú poštu tohto účtu, musíte ich zakázať alebo zmeniť cieľový priečinok. Ak niektoré účty využívajú v tomto účte špeciálne priečinky (Odoslaná pošta, Návrhy, Šablóny), musíte zmeniť ich nastavenie tak, aby boli v druhom účte. Naozaj chcete ukladať poštu tohto účtu do iného účtu?
 confirmDeferAccountTitle=Podriadiť tento účet?
 
-directoryUsedByOtherServer=Tento priečinok je už využívaný iným serverom. Zvoľte iný priečinok.
+directoryUsedByOtherAccount=Tento priečinok je už využívaný účtom %S. Zvoľte iný priečinok.
 #Provide default example values for sample email address
 exampleEmailUserName=pouzivatel
 exampleEmailDomain=priklad.sk
 emailFieldText=E-mailová adresa:
 #LOCALIZATION NOTE: defaultEmailText: %1$S is user name, %2$S is domain
 defaultEmailText=Zadajte vašu e-mailovú adresu. Túto adresu budú ostatní používať pre odosielanie správ vám (napr.  "%1$S@%2$S").
 #LOCALIZATION NOTE: customizedEmailText: %1$S is provider, %2$S is email username, %3$S is sample email, %4$S is sample username
 customizedEmailText=Zadajte %2$S vášho %1$S. (Napríklad, ak vaša e-mailová adresa %1$S je "%3$S", váš %2$S je "%4$S".)
--- a/toolkit/chrome/global/contentAreaCommands.properties
+++ b/toolkit/chrome/global/contentAreaCommands.properties
@@ -1,11 +1,13 @@
 # context menu strings
 
 SaveImageTitle=Uložiť obrázok
+SaveVideoTitle=Uložiť video
+SaveAudioTitle=Uložiť zvuk
 SaveLinkTitle=Uložiť ako
 DefaultSaveFileName=index
 WebPageCompleteFilter=Webová stránka, kompletná
 WebPageHTMLOnlyFilter=Webová stránka, iba HTML
 WebPageXHTMLOnlyFilter=Webová stránka, iba XHTML
 WebPageSVGOnlyFilter=Webová stránka, iba SVG
 WebPageXMLOnlyFilter=Webová stránka, iba XML
 
--- a/toolkit/chrome/mozapps/help/help.dtd
+++ b/toolkit/chrome/mozapps/help/help.dtd
@@ -17,19 +17,18 @@
 <!ENTITY goBackCmd.commandkey           "[">
 <!ENTITY goForwardCmd.commandkey        "]">
 <!ENTITY homeButton.label               "Domov">
 <!ENTITY homeButton.tooltip             "Prejde na hlavnú stránku Pomocníka">
 <!ENTITY printButton.label              "Tlačiť">
 <!ENTITY printButton.tooltip            "Vytlačí túto stránku">
 <!ENTITY closeWindow.commandkey         "W">
 
-<!ENTITY searchtab.label                "Hľadať">
-<!ENTITY searchtab.accesskey            "H">
-<!ENTITY searchClose.tooltip            "Zavrieť výsledky vyhľadávania">
+<!ENTITY search.emptytext               "Hľadať">
+<!ENTITY searchHeader.label             "Výsledky vyhľadávania">
 <!ENTITY toctab.label                   "Obsah">
 <!ENTITY toctab.accesskey               "O">
 
 <!-- LOCALIZATION NOTE :
 fullZoomEnlargeCmd.commandkey3, fullZoomReduceCmd.commandkey2 and
 fullZoomResetCmd.commandkey2 are alternative acceleration keys for zoom.
 If shift key is needed with your locale popular keyboard for them,
 you can use these alternative items. Otherwise, their values should be empty.  -->
--- a/toolkit/chrome/mozapps/update/updates.properties
+++ b/toolkit/chrome/mozapps/update/updates.properties
@@ -30,17 +30,17 @@ downloadButton_minor.accesskey=P
 downloadButton_major=Získať novú verziu »
 downloadButton_major.accesskey=Z
 notNowButton=Teraz nie
 notNowButton.accesskey=T
 neverButton=Nikdy
 neverButton.accesskey=N
 
 resumePausedAfterCloseTitle=Aktualizácia pozastavená
-resumePausedAfterCloseMessage=Preberanie aktualizácie bolo pozastavené. Chcete, aby aplikácia %S prevzala aktualizáciu na pozadí, zatiaľ čo vy budete môcť pokračovať v práci?
+resumePausedAfterCloseMsg=Preberanie aktualizácie bolo pozastavené. Chcete, aby bola aktualizácia prevzatá na pozadí, zatiaľ čo vy budete môcť pokračovať v práci s aplikáciou %S?
 
 updateReadyToInstallHeader=%S je pripravený na inštaláciu
 
 checker_error-200=AUS: Chybný aktualizačný súbor XML (200)
 checker_error-403=AUS: Prístup odmietnutý (403)
 checker_error-404=AUS: Aktualizačný súbor XML sa nenašiel (404)
 checker_error-500=AUS: Vnútorná chyba servera (500)
 checker_error-2152398849=Nepodarilo sa (neznámy dôvod)