update FENNEC_4_0b2_BUILD1 FENNEC_4_0b2_BUILD2 FENNEC_4_0b2_BUILD3 FENNEC_4_0b2_BUILD4 FENNEC_4_0b2_RELEASE FENNEC_4_0b3_BUILD1 FENNEC_4_0b3_BUILD2 FENNEC_4_0b3_BUILD3 FENNEC_4_0b3_RELEASE
authorsektormaster@atlas.sk
Wed, 20 Oct 2010 09:38:03 +0200
changeset 138 1ce7be788ffa8edbcedb0f172218f2e788e22306
parent 133 8ef31b5f99b56c2ce50ddf7b2774201966eed697
child 139 18692b17f22a0346e21ee8f163e7e4dbf5b10c43
child 149 9a24c65a106f46f2b867bad795180a28e7b2d0b9
push id1
push usersledru@mozilla.com
push dateFri, 05 Dec 2014 02:19:11 +0000
update
browser/chrome/browser/aboutDialog.dtd
browser/chrome/browser/browser.dtd
browser/chrome/browser/tabbrowser.properties
browser/chrome/browser/tabview.properties
mail/chrome/messenger/quickFilterBar.dtd
mail/chrome/messenger/vCardImportMsgs.properties
mobile/chrome/about.dtd
mobile/chrome/browser.dtd
mobile/chrome/browser.properties
mobile/chrome/overrides/aboutRights.dtd
mobile/chrome/preferences.dtd
suite/chrome/common/help/help-index1.rdf
suite/chrome/common/help/mail_help.xhtml
suite/chrome/common/help/mail_sec_help.xhtml
suite/chrome/common/help/mailnews_account_settings.xhtml
suite/chrome/common/help/mailnews_security.xhtml
suite/chrome/common/help/privacy_help.xhtml
suite/chrome/common/help/suite-toc.rdf
suite/chrome/common/notification.properties
toolkit/chrome/global/aboutSupport.properties
toolkit/chrome/global/headsUpDisplay.properties
toolkit/chrome/global/webConsole.dtd
toolkit/chrome/mozapps/extensions/extensions.dtd
toolkit/chrome/mozapps/update/updates.dtd
--- a/browser/chrome/browser/aboutDialog.dtd
+++ b/browser/chrome/browser/aboutDialog.dtd
@@ -22,17 +22,17 @@
 <!-- LOCALIZATION NOTE (bottomLinks.privacy): This is a link title that links to http://www.mozilla.com/legal/privacy/. -->
 <!ENTITY bottomLinks.privacy        "Zásady ochrany súkromia">
 
 <!-- LOCALIZATION NOTE (update.checkingForUpdates): try to make the localized text short (see bug 596813 for screenshots). -->
 <!ENTITY update.checkingForUpdates  "Vyhľadávajú sa aktualizácie…">
 <!-- LOCALIZATION NOTE (update.checkingAddonCompat): try to make the localized text short (see bug 596813 for screenshots). -->
 <!ENTITY update.checkingAddonCompat "Kontroluje sa kompatibilita doplnkov…">
 <!-- LOCALIZATION NOTE (update.noUpdatesFound): try to make the localized text short (see bug 596813 for screenshots). -->
-<!ENTITY update.noUpdatesFound      "Máte najnovšiu verziu prehliadača &brandShortName;">
+<!ENTITY update.noUpdatesFound      "Používate najnovšiu verziu prehliadača &brandShortName;">
 <!-- LOCALIZATION NOTE (update.adminDisabled): try to make the localized text short (see bug 596813 for screenshots). -->
 <!ENTITY update.adminDisabled       "Aktualizácie boli vypnuté správcom systému">
 
 <!-- LOCALIZATION NOTE (update.failed.start,update.failed.linkText,update.failed.end):
      update.failed.start, update.failed.linkText, and update.failed.end all go into
      one line with linkText being wrapped in an anchor that links to a site to download
      the latest version of Firefox (e.g. http://www.firefox.com). As this is all in
      one line, try to make the localized text short (see bug 596813 for screenshots). -->
--- a/browser/chrome/browser/browser.dtd
+++ b/browser/chrome/browser/browser.dtd
@@ -144,16 +144,17 @@ can reach it easily. -->
 
 <!ENTITY bookmarksButton.label          "Záložky">
 <!ENTITY bookmarksButton.tooltip        "Zobraziť záložky">
 <!ENTITY bookmarksButton.accesskey  "Z">
 <!ENTITY bookmarksCmd.commandkey "b">
 
 <!ENTITY bookmarksMenuButton.label          "Záložky">
 <!ENTITY bookmarksMenuButton.tooltip        "Zobraziť záložky">
+<!ENTITY bookmarksMenuButton.unsorted.label "Nezaradené záložky">
 <!ENTITY viewBookmarksSidebar.label         "Zobraziť v bočnom paneli">
 <!ENTITY viewBookmarksToolbar.label         "Zobraziť panel nástrojov Záložky">
 
 <!-- LOCALIZATION NOTE (bookmarksSidebarGtkCmd.commandkey): This command
   -  key should not contain the letters A-F, since these are reserved
   -  shortcut keys on Linux. -->
 <!ENTITY bookmarksGtkCmd.commandkey "o">
 <!ENTITY bookmarksWinCmd.commandkey "i">
@@ -508,20 +509,16 @@ you can use these alternative items. Oth
 <!ENTITY findAgainCmd.commandkey2 "VK_F3">
 
 <!ENTITY spellAddDictionaries.label "Pridať slovníky…">
 <!ENTITY spellAddDictionaries.accesskey "P">
 
 <!ENTITY editBookmark.done.label                     "Hotovo">
 <!ENTITY editBookmark.cancel.label                   "Zrušiť">
 <!ENTITY editBookmark.removeBookmark.accessKey       "O">
-<!ENTITY editBookmark.undo.label                     "Späť">
-<!ENTITY editBookmark.undo.accessKey                 "S">
-<!ENTITY editBookmark.edit.label                     "Upraviť…">
-<!ENTITY editBookmark.edit.accessKey                 "U">
 
 <!ENTITY identity.unverifiedsite2 "Táto webová stránka neposkytuje informácie o svojej identite.">
 <!ENTITY identity.connectedTo "Pripojené k stránke">
 <!-- Localization note (identity.runBy) : This string appears between a
 domain name (above) and an organization name (below). E.g.
 
 example.com
 which is run by
--- a/browser/chrome/browser/tabbrowser.properties
+++ b/browser/chrome/browser/tabbrowser.properties
@@ -1,9 +1,23 @@
+# LOCALIZATION NOTE: the following strings can be used in the tab title or
+# location bar to represent various states as a web page loads:
+# tabs.connecting = Firefox is sending a HTTP connection request
+# tabs.encryptingConnection = Firefox is sending a HTTPS connection request
+# tabs.searching = Firefox is searching for something (Awesomebar or Web search)
+# tabs.loading = Firefox is loading the web page
+# tabs.waiting = Firefox is waiting for a web resource to load
+# tabs.downloading = Firefox is downloading a file for a helper application (PDF)
+tabs.connecting=Pripája sa…
+tabs.encryptingConnection=Zabezpečuje sa pripojenie…
+tabs.searching=Vyhľadáva sa…
 tabs.loading=Načítava sa…
+tabs.waiting=Čaká sa…
+tabs.downloading=Preberá sa…
+
 tabs.emptyTabTitle=Nová karta
 tabs.closeTab=Zavrieť kartu
 tabs.close=Zavrieť
 tabs.closeWarningTitle=Potvrdenie zatvorenia
 tabs.closeWarningMultipleTabs=Chystáte sa zavrieť niekoľko kariet (%S). Naozaj chcete pokračovať?
 tabs.closeButtonMultiple=Zavrieť karty
 tabs.closeWarningPromptMe=Upozorniť vždy, ak sa pokúšam zavrieť viac kariet naraz
 
--- a/browser/chrome/browser/tabview.properties
+++ b/browser/chrome/browser/tabview.properties
@@ -1,3 +1,4 @@
 tabview.groupItem.newTabButton=Nová karta
 tabview.groupItem.defaultName=Pomenovať túto skupinu kariet…
+tabview.groupItem.undoCloseGroup=Obnoviť zatvorenú skupinu
 tabview.search.otherWindowTabs=Karty z ostatných okien
--- a/mail/chrome/messenger/quickFilterBar.dtd
+++ b/mail/chrome/messenger/quickFilterBar.dtd
@@ -43,17 +43,17 @@
 <!ENTITY quickFilterBar.unread.label
          "Neprečítané">
 
 <!-- LOCALIZATION NOTE (quickFilterBar.unread.tooltip):
      The tooltip for the filter button that causes us to filter results to only
      include unread messages.
      -->
 <!ENTITY quickFilterBar.unread.tooltip
-         "Zobraziť len prečítané správy">
+         "Zobraziť len neprečítané správy">
 
 <!-- LOCALIZATION NOTE (quickFilterBar.starred.label):
      The label for the filter button that causes us to filter results to only
      include messages that have been starred/flagged.
      -->
 <!ENTITY quickFilterBar.starred.label
          "Označené hviezdičkou">
 
--- a/mail/chrome/messenger/vCardImportMsgs.properties
+++ b/mail/chrome/messenger/vCardImportMsgs.properties
@@ -8,17 +8,15 @@ vCardImportName=Súbor vizitky vCard (.vcf)
 vCardImportDescription=Importovať adresár z formátu vCard
 
 vCardImportAddressName=Adresár súboru vCard
 
 # LOCALIZATION NOTE (vCardImportAddressSuccess): %S is replaced by the
 # name of the address book being imported.
 vCardImportAddressSuccess=Importovaný adresár %S
 
-vCardImportAddressBadParam=Pri importovaní adresára bol použitý neplatný parameter.
-
 # LOCALIZATION NOTE (vCardImportAddressSuccess): %S is replaced by the
 # name of the address book being imported.
 vCardImportAddressBadSourceFile=Chyba pri pristupovaní k súboru adresára %S.
 
 # LOCALIZATION NOTE (vCardImportAddressSuccess): %S is replaced by the
 # name of the address book being imported.
 vCardImportAddressConvertError=Chyba pri importovaní adresára %S, nemuseli byť importované všetky adresy.
--- a/mobile/chrome/about.dtd
+++ b/mobile/chrome/about.dtd
@@ -1,14 +1,18 @@
 <!ENTITY aboutPage.title                        "O programe &brandShortName;">
 <!ENTITY aboutPage.faq.label                    "Často kladené otázky">
 <!ENTITY aboutPage.support.label                "Podpora">
 <!ENTITY aboutPage.privacyPolicy.label          "Zásady ochrany súkromia">
 <!ENTITY aboutPage.rights.label                 "Spoznajte svoje práva">
 <!ENTITY aboutPage.relNotes.label               "Poznámky k vydaniu">
 <!ENTITY aboutPage.credits.label                "Tvorcovia">
+<!ENTITY aboutPage.checkForUpdates.button       "Vyhľadať aktualizácie">
+<!ENTITY aboutPage.checkForUpdates.checking     "Vyhľadávajú sa aktualizácie…">
+<!ENTITY aboutPage.checkForUpdates.none         "Nie sú dostupné žiadne aktualizácie">
+<!ENTITY aboutPage.checkForUpdates.found        "Aktualizácia je dostupná">
 
 <!-- LOCALIZATION NOTE:
      These strings are concatenated in order. Unneeded strings may be left blank.
   -->
 <!ENTITY aboutPage.copyrightInfo1               "&#169;1998-2010 Prispievatelia. Všetky práva vyhradené. ">
 <!ENTITY aboutPage.licenseLink                  "Informácie o licenciách">
 <!ENTITY aboutPage.copyrightInfo2               ".">
--- a/mobile/chrome/browser.dtd
+++ b/mobile/chrome/browser.dtd
@@ -50,17 +50,18 @@
 
 <!ENTITY downloadShowPage.label    "Prejsť na stránku">
 <!ENTITY downloadShow2.label       "Nájsť">
 <!ENTITY downloadOpen2.label       "Otvoriť">
 <!ENTITY downloadCancel.label      "Zrušiť">
 <!ENTITY downloadPause.label       "Pozastaviť">
 <!ENTITY downloadResume.label      "Pokračovať">
 <!ENTITY downloadRetry.label       "Znova">
-<!ENTITY downloadRemove.label      "Odstrániť">
+<!ENTITY downloadRemove.label      "Vymazať">
+<!ENTITY downloadDelete.label      "Odstrániť">
 <!ENTITY downloadFailed.label      "Neúspešné">
 
 <!ENTITY noResults.label           "Žiadne výsledky">
 <!ENTITY allBookmarks.label        "Zobraziť všetky záložky">
 
 <!ENTITY bookmarkPopup.label       "Stránka pridaná medzi záložky">
 <!ENTITY bookmarkRemove.label      "Odstrániť">
 <!ENTITY bookmarkEdit.label        "Upraviť">
@@ -88,16 +89,19 @@
 
 <!ENTITY contextOpenInNewTab.label    "Otvoriť odkaz na novej karte">
 <!ENTITY contextSaveLink.label        "Uložiť odkaz">
 <!ENTITY contextSaveImage.label       "Uložiť obrázok">
 <!ENTITY contextShareLink.label       "Zdieľať odkaz">
 <!ENTITY contextShareImage.label      "Zdieľať obrázok">
 <!ENTITY contextSaveVideo.label       "Uložiť video">
 <!ENTITY contextShareVideo.label      "Zdieľať video">
+<!ENTITY contextPlayMedia.label       "Prehrať">
+<!ENTITY contextPauseMedia.label      "Pozastaviť">
+<!ENTITY contextFullScreen.label      "Na celú obrazovku">
 <!ENTITY contextEditBookmark.label    "Upraviť">
 <!ENTITY contextRemoveBookmark.label  "Odstrániť">
 
 <!ENTITY pageactions.saveas.pdf      "Uložiť ako PDF">
 <!ENTITY pageactions.share.page      "Zdieľať stránku">
 <!ENTITY pageactions.password.forget "Zabudnúť heslo">
 <!ENTITY pageactions.reset           "Vymazať nastavenia stránky">
 <!ENTITY pageactions.findInPage      "Hľadať na stránke">
--- a/mobile/chrome/browser.properties
+++ b/mobile/chrome/browser.properties
@@ -73,16 +73,17 @@ addonLocalError-4=Doplnok #1 nemohol byť nainštalovaný, pretože #3 nemohol upraviť potrebný súbor.
 downloadsStatus=#1 — #2
 downloadsUnknownSize=Neznáma veľkosť
 # LOCALIZATION NOTE (KnownSize): #1 size number; #2 size unit
 downloadsKnownSize=#1 #2
 donwloadsYesterday=Včera
 # LOCALIZATION NOTE (MonthDate): #1 month name; #2 date number; e.g., January 22
 downloadsMonthDate=#1 #2
 downloadsEmpty=Žiadne prevzaté súbory
+downloadsDeleteTitle=Odstránenie súboru
 
 # Alerts
 alertAddons=Doplnky
 alertAddonsInstalling=Inštaluje sa doplnok
 alertAddonsInstalled=Inštalácia dokončená. Vyžadovaný reštart.
 alertAddonsFail=Instalácia zlyhala
 alertLockScreen=Orientácia obrazovky
 alertLockScreen.locked=Zamknuté
@@ -163,16 +164,21 @@ tabs.closeWarningTitle=Potvrdenie zatvor
 # LOCALIZATION NOTE (tabs.closeWarning): Semi-colon list of plural forms.
 # See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # #1 number of tabs (must be greater than 1)
 tabs.closeWarning=NOT USED;Chystáte sa zavrieť #1 karty. Pokračovať?;Chystáte sa zavrieť #1 kariet. Pokračovať?
 
 tabs.closeButton=Zavrieť karty
 tabs.closeWarningPromptMe=Upozorniť vždy, ak sa pokúšam zavrieť viac kariet naraz
 
+tabs.crashWarningTitle=Ospravedlňujeme sa!
+tabs.crashWarningMsg=Počas zobrazovania stránky niečo zlyhalo.
+tabs.crashClose=Zavrieť kartu
+tabs.crashReload=Znova načítať kartu
+
 # Homepage
 # LOCALIZATION NOTE: homepage.custom2 is the text displayed on the selector button if
 # the user selects a webpage to be the startpage. We can't display the entire URL
 # or webpage title on the menulist
 homepage.custom2=Vlastná stránka
 
 # Page Actions
 pageactions.saveas.pdf=Uložiť ako PDF
deleted file mode 100644
--- a/mobile/chrome/overrides/aboutRights.dtd
+++ /dev/null
@@ -1,66 +0,0 @@
-<!-- LOCALIZATION NOTE: this file is a direct copy of
-     toolkit/locales/en-US/chrome/global/aboutRights.dtd
-     with the exception of the XXX comment below. -->
-
-<!-- rights.locale-direction instead of the usual local.dir entity, so RTL can skip translating page. -->
-<!ENTITY rights.locale-direction "ltr">
-<!ENTITY rights.pagetitle       "about:rights">
-<!ENTITY rights.intro-header    "Informácie o vašich právach">
-<!ENTITY rights.intro "&brandFullName; je voľne šíriteľný otvorený softvér vytvorený spoločenstvom tisícov prispievateľov z celého sveta. Tu je niekoľko faktov, o ktorých by ste mali vedieť:">
-
-<!-- Note on pointa / pointb / pointc form:
-     These points each have an embedded link in the HTML, so each point is
-     split into chunks for text before the link, the link test, and the text
-     after the link. If a localized grammar doesn't need the before or after
-     chunk, it can be left blank.
-
-     Also note the leading/trailing whitespace in strings here, which is
-     deliberate for formatting around the embedded links. -->
-<!ENTITY rights.intro-point1a "&brandShortName; je dostupný za podmienok licencie ">
-<!ENTITY rights.intro-point1b "Mozilla Public License">
-<!ENTITY rights.intro-point1c ". To znamená, že &brandShortName; môžete používať, kopírovať a ďalej rozširovať. Takisto môžete upravovať zdrojový kód &brandShortName;u podľa vašich predstáv. Licencia Mozilla Public License umožňuje šírenie aj upravených verzií.">
-
-<!ENTITY rights.intro-point2a "Mozilla vám nedáva právo na používanie ochranných známok a logotypov Mozilla a Firefox. Ďalšie informácie o ochranných známkach získate ">
-<!ENTITY rights.intro-point2b "na tejto stránke">
-<!ENTITY rights.intro-point2c ".">
-
-<!-- point 3 text for official branded builds -->
-<!ENTITY rights.intro-point3a "Zásady ochrany súkromia pre produkty &vendorShortName; nájdete ">
-<!ENTITY rights.intro-point3b "na tejto stránke">
-<!ENTITY rights.intro-point3c ".">
-
-<!-- point 3 text for unbranded builds -->
-<!ENTITY rights.intro-point3-unbranded "Tu by mali byť uvedené všetky platné zásady ochrany súkromia.">
-
-<!-- point 4 text for official branded builds -->
-<!ENTITY rights.intro-point4a "&brandShortName; tiež ponúka voliteľné služby webových stránok, ako napríklad služba SafeBrowsing. Nemôžeme však zaručiť, že pracujú na 100&#37; a sú dostupné bez chýb. Ďalšie podrobnosti vrátane informácií o možnostiach vypnutia týchto služieb nájdete v ich ">
-<!ENTITY rights.intro-point4b "podmienkach použitia">
-<!ENTITY rights.intro-point4c ".">
-
-<!-- point 4 text for unbranded builds -->
-<!ENTITY rights.intro-point4a-unbranded "Ak sú súčasťou tohto produktu webové služby, podmienky použitia týchto služieb by mali byť uvedené v sekcii ">
-<!ENTITY rights.intro-point4b-unbranded "Služby webových stránok">
-<!ENTITY rights.intro-point4c-unbranded ".">
-
-<!ENTITY rights.webservices-header "&brandFullName; - Služby webových stránok">
-
-<!-- intro paragraph for branded builds -->
-<!-- XXX Edited this section to remove the specific reference to Firefox UI (see bug 514817) -->
-<!ENTITY rights.webservices-a "&brandFullName; ponúka služby webových stránok (ďalej len &quot;Služby&quot;), ako napríklad SafeBrowsing, ktoré je možné používať s touto binárnou verziou &brandShortName;u tak, ako je popísané nižšie. Ak nechcete tieto Služby používať alebo podmienky ich používania nie sú pre vás prijateľné, môžete službu SafeBrowsing vypnúť v nastaveniach programu.">
-<!ENTITY rights.webservices-b "">
-<!ENTITY rights.webservices-c "">
-
-<!-- intro paragraph for unbranded builds -->
-<!ENTITY rights.webservices-unbranded "Tu by mal byť uvedený prehľad webových služieb zahrnutých v produkte, ako aj návod na ich vypnutie (ak je vypnutie možné).">
-
-<!-- point 1 text for unbranded builds -->
-<!ENTITY rights.webservices-term1-unbranded "Tu by mali byť uvedené podmienky používania každej webovej služby pre tento produkt.">
-
-<!-- points 1-7 text for branded builds -->
-<!ENTITY rights.webservices-term1 "&vendorShortName; a jej prispievatelia, poskytovatelia licencií a partneri pracujú na tom, aby poskytli čo najpresnejšie a najaktuálnejšie informácie o podvodných a škodlivých stránkach. Napriek tomu nemôžu garantovať, že poskytované informácie sú komplexné a bez chýb: niektoré rizikové stránky nemusia byť identifikované a niektoré bezpečné stránky môžu byť omylom označené ako podozrivé.">
-<!ENTITY rights.webservices-term2 "&vendorShortName; môže zrušiť využívanie alebo zmeniť Služby podľa svojho uváženia.">
-<!ENTITY rights.webservices-term3 "Tieto Služby môžete využívať s priloženou verziou produktu &brandShortName;, na jej využívanie máte všetky potrebné práva. &vendorShortName; a jej poskytovatelia licencií si vyhradzujú všetky ostatné práva k Službám. Tieto podmienky používania neobmedzujú akékoľvek práva poskytnuté licenciou na softvér s otvoreným kódom použiteľné na &brandShortName; a príslušnú verziu zdrojového kódu produktu &brandShortName;.">
-<!ENTITY rights.webservices-term4 "Služby sú poskytované &quot;ako sú&quot;. &vendorShortName;, jej prispievatelia, poskytovatelia licencií a distribútori týmto odmietajú všetky výslovné alebo predpokladané záruky zahrňujúce okrem iného záruku, že Služby sú predajné a spôsobilé na konkrétny účel. Nesiete všetko riziko vyplývajúce z výberu Služieb pre svoje účely týkajúce sa kvality a výkonu Služieb. Niektoré jurisdikcie neumožňujú vylúčenie alebo odmietnutie predpokladaných záruk, takže sa vás toto odmietnutie zodpovednosti nemusí týkať.">
-<!ENTITY rights.webservices-term5 "S výnimkou rozsahu určeného zákonom spoločnosť &vendorShortName;, jej prispievatelia, poskytovatelia licencií a distribútori nenesú zodpovednosť za žiadne nepriame, zvláštne, vedľajšie, náhodné, následné, trestné alebo exemplárne škody vzniknuté použitím produktu &brandShortName; a Služieb. Spoločná zodpovednosť vyplývajúca z týchto podmienok nepresiahne 500 USD (päťsto dolárov). Niektoré jurisdikcie neumožňujú vylúčenie alebo odmietnutie zodpovednosti za stanovené škody, takže sa vás toto odmietnutie zodpovednosti nemusí týkať.">
-<!ENTITY rights.webservices-term6 "&vendorShortName; môže z času na čas podľa potreby upraviť tieto podmienky používania. Tieto podmienky používania nesmú byť upravené alebo zrušené bez písomnej dohody so spoločnosťou &vendorShortName;.">
-<!ENTITY rights.webservices-term7 "Tieto podmienky používania sa riadia zákonmi štátu Kalifornia, USA, s výnimkou jeho zákonných ustanovení, ktorá si protirečia. Ak bude niektorá časť týchto podmienok považovaná za neplatnú alebo nevynútiteľnú, platnosť zostávajúcich častí zostane úplne nedotknutá. V prípade rozdielov medzi lokalizovanou verziou a anglickým originálom je rozhodujúcim jazykom týchto podmienok anglický jazyk.">
--- a/mobile/chrome/preferences.dtd
+++ b/mobile/chrome/preferences.dtd
@@ -14,15 +14,15 @@
 <!ENTITY language.auto                             "Automaticky detekovať">
 <!ENTITY defaultBrowser.title                      "Predvolený prehliadač">
 <!ENTITY defaultBrowser.description                "Nastaviť &brandShortName; ako predvolený prehliadač">
 <!ENTITY homepage.title                            "Úvodná stránka">
 <!ENTITY homepage.none                             "Prázdna stránka">
 <!ENTITY homepage.default                          "Úvodná stránka prehliadača &brandShortName;">
 <!ENTITY homepage.currentpage                      "Použiť aktuálnu stránku">
 <!ENTITY sync.title                                "Synchronizácia">
-<!ENTITY sync.account                              "Používateľské meno/E-mailová adresa">
+<!ENTITY sync.account2                             "Názov účtu">
 <!ENTITY sync.password                             "Heslo">
 <!ENTITY sync.syncKey                              "Kľúč synchronizácie">
 <!ENTITY sync.deviceName                           "Názov zariadenia">
 <!ENTITY sync.connect                              "Pripojiť">
 <!ENTITY sync.disconnect                           "Odpojiť">
 <!ENTITY sync.syncNow                              "Synchronizovať">
--- a/suite/chrome/common/help/help-index1.rdf
+++ b/suite/chrome/common/help/help-index1.rdf
@@ -649,17 +649,17 @@
    <nc:subheadings>
      <rdf:Seq><rdf:li>
        <rdf:Description ID="email_addresses"
          nc:name="e-mailové adresy"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="encryption"
          nc:name="šifrovanie"
-         nc:link="mail_sec_help.xhtml#signing_and_encrypting_messages"/>
+         nc:link="mailnews_security.xhtml#signing_and_encrypting_messages"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="JSConsole"
          nc:name="chybová konzola"
          nc:link="developer_tools.xhtml#js_console"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="extensions_panel"
@@ -684,32 +684,32 @@
    </nc:subheadings>
 </rdf:Description>
 
 <rdf:Description about="#encryption">
    <nc:subheadings>
      <rdf:Seq><rdf:li>
        <rdf:Description ID="encryption:about"
          nc:name="čo je šifrovanie a podpisovanie"
-         nc:link="mail_sec_help.xhtml#about_digital_signatures_and_encryption"/>
+         nc:link="mailnews_security.xhtml#about_digital_signatures_and_encryption"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="encryption:of_email_messages"
          nc:name="zašifrované e-mailové adresy"
-         nc:link="mail_sec_help.xhtml#signing_and_encrypting_messages"/>
+         nc:link="mailnews_security.xhtml#signing_and_encrypting_messages"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="encryption:of_stored_sensitive_information"
          nc:name="ukladanie citlivých informácií"
          nc:link="using_priv_help.xhtml#encrypting_stored_sensitive_information"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="encryption:settings_for_email"
          nc:name="nastavenia šifrovania"
-         nc:link="mail_sec_help.xhtml#configuring_security_settings"/>
+         nc:link="mailnews_security.xhtml#configuring_security_settings"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="encryption:status_of_web_page"
          nc:name="bezpečnosť webovej stránky"
          nc:link="using_certs_help.xhtml#checking_security_for_a_web_page"/>
      </rdf:li></rdf:Seq>
    </nc:subheadings>
 </rdf:Description>
@@ -1840,17 +1840,17 @@
      <rdf:li>
        <rdf:Description ID="Sidebar"
          nc:name="Bočný panel"
          nc:link="customize_help.xhtml#what_is_sidebar"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="signing_email_messages"
          nc:name="podpisovanie e-mailových správ"
-         nc:link="mail_sec_help.xhtml#signing_and_encrypting_messages"/>
+         nc:link="mailnews_security.xhtml#signing_and_encrypting_messages"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="smart_cards"
          nc:name="zariadenia smart cards"
          nc:link="using_certs_help.xhtml#managing_smart_cards_and_other_security_devices"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="SSL"
@@ -1905,27 +1905,27 @@
    </nc:subheadings>
 </rdf:Description>
 
 <rdf:Description about="#security">
    <nc:subheadings>
      <rdf:Seq><rdf:li>
        <rdf:Description ID="security:checking_before_sending_message"
          nc:name="kontrola bezpečnosti pred odoslaním správy"
-         nc:link="mail_sec_help.xhtml#message_security_compose_window"/>
+         nc:link="mailnews_security.xhtml#message_security_compose_window"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="security:checking_for_a_web_page"
          nc:name="kontroly bezpečnosti webovej stránky"
          nc:link="using_certs_help.xhtml#checking_security_for_a_web_page"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="security:checking_for_received_messages"
          nc:name="kontrola bezpečnosti prijatých správ"
-         nc:link="mail_sec_help.xhtml#reading_signed_and_encrypted_messages"/>
+         nc:link="mailnews_security.xhtml#reading_signed_and_encrypted_messages"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="security:preferences"
          nc:name="nastavenia bezpečnosti"
          nc:link="privsec_help.xhtml"/>
      </rdf:li></rdf:Seq>
    </nc:subheadings>
 </rdf:Description>
--- a/suite/chrome/common/help/mail_help.xhtml
+++ b/suite/chrome/common/help/mail_help.xhtml
@@ -67,17 +67,17 @@
     <li><a href="mailnews_organizing.xhtml">Organizing Your Messages</a></li>
     <li><a href="mailnews_organizing.xhtml#controlling_junk_mail">Controlling
       Junk Mail</a></li>
     <li><a href="mailnews_newsgroups.xhtml">Getting Started with
       Newsgroups</a></li>
     <li><a href="mailnews_blogs_and_feeds.xhtml">Getting Started
       with Blogs &amp; News Feeds</a></li>
     <li><a href="mailnews_offline.xhtml">Working Offline</a></li>
-    <li><a href="mail_sec_help.xhtml">Signing &amp; Encrypting
+    <li><a href="mailnews_security.xhtml">Signing &amp; Encrypting
       Messages</a></li>
     <li><a href="mailnews_account_settings.xhtml">Mail &amp; Newsgroups
       Account Settings</a></li>
     <li><a href="mailnews_preferences.xhtml">Mail &amp; Newsgroups
       Preferences</a></li>
   </ul>
 </div>
 
deleted file mode 100644
--- a/suite/chrome/common/help/mail_sec_help.xhtml
+++ /dev/null
@@ -1,455 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
-  "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"[
-  <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" >
-  %brandDTD;
-]>
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>Signing &amp; Encrypting Messages</title>
-<link rel="stylesheet" href="helpFileLayout.css"
-  type="text/css"/>
-</head>
-<body>
-
-<h1 id="signing_and_encrypting_messages">Signing &amp; Encrypting Messages</h1>
-
-<div class="contentsBox">In this section:
-  <ul>
-    <li><a href="#about_digital_signatures_and_encryption">About Digital
-      Signatures &amp; Encryption</a></li>
-    <li><a href="#getting_other_peoples_certificates">Getting Other
-      People&apos;s Certificates</a></li>
-    <li><a href="#configuring_security_settings">Configuring Security
-      Settings</a></li>
-    <li><a href="#signing_and_encrypting_a_new_message">Signing &amp;
-      Encrypting a New Message</a></li>
-    <li><a href="#reading_signed_and_encrypted_messages">Reading Signed &amp;
-      Encrypted Messages</a></li>
-    <li><a href="#message_security_compose_window">Message Security -
-      Compose Window</a></li>
-    <li><a href="#message_security_received_message">Message Security -
-      Received Message</a></li>
-  </ul>
-</div>
-
-<h2 id="about_digital_signatures_and_encryption">About Digital Signatures &amp;
-  Encryption </h2>
-
-<p>When you compose a mail message, you can choose to attach your digital
-  signature to it. A <a href="glossary.xhtml#digital_signature">digital
-  signature</a> allows recipients of the message to verify that the message
-  really comes from you and hasn&apos;t been tampered with since you sent
-  it.</p>
-
-<p>When you compose a mail message, you can also choose to encrypt it.
-  <a href="glossary.xhtml#encryption">Encryption</a> makes it very difficult
-  for anyone other than the intended recipient to read the message while it is
-  in transit over the Internet.</p>
-
-<p>Signing and encryption are not available for newsgroup messages.</p>
-
-<p>Before you can sign or encrypt a message, you must take these preliminary
-  steps:</p>
-
-<ol>
-  <li>Obtain one or more <a href="glossary.xhtml#certificate">certificates</a>
-    (the digital equivalents of ID cards). For details, see
-    <a href="using_certs_help.xhtml#getting_your_own_certificate">Getting Your
-    Own Certificate</a>.</li>
-  <li>Configure the security settings for your email account. For details, see
-    <a href="mailnews_account_settings.xhtml#security">Configuring Your
-    Security Settings</a>.
-  </li>
-</ol>
-
-<p>Once you have completed these steps, you can complete the instructions in
-  <a href="#signing_and_encrypting_a_new_message">Signing &amp; Encrypting a 
-  New Message</a>.</p>
-
-<p>The sections that follow provide a brief overview of how digital signatures
-  and encryption work. For more technical details on this subject, see the
-  online document
-  <a href="http://developer.mozilla.org/en/docs/Introduction_to_Public-Key_Cryptography">Introduction
-  to Public-Key Cryptography</a>.</p>
-
-<h3 id="how_digital_signatures_work">How Digital Signatures Work</h3>
-
-<p>A digital signature is a special code, unique to each message, created by
-  means of <a href="glossary.xhtml#public-key_cryptography">public-key
-  cryptography</a>.</p>
-
-<p>A digital signature is completely different from a handwritten signature,
-  although it can sometimes be used for similar legal purposes, such as signing
-  a contract.</p>
-
-<p>To create a digital signature for an email message that you are sending, you
-  need two things:</p>
-
-<ul>
-  <li>A <a href="glossary.xhtml#signing_certificate">signing certificate</a>
-    that identifies you for this purpose. Every time you sign a message, your
-    signing certificate is included with the message. The certificate includes
-    a <a href="glossary.xhtml#public_key">public key</a>. The presence of the
-    certificate in the message permits the recipient to verify your digital
-    signature.
-
-    <p>Your certificate is a bit like your name and phone number in the
-      phonebook&mdash;it is public information that helps other people
-      communicate with you.</p>
-  </li>
-  <li>A <a href="glossary.xhtml#private_key">private key</a>, which is created
-    and stored on your computer when you first obtain a certificate.
-
-    <p>Your private key for a signing certificate is protected by your
-      <a href="glossary.xhtml#master_password">Master Password</a>, and the
-      &brandShortName; program does not disclose it to anyone else. The Mail
-      &amp; Newsgroup software uses your private key to create a unique,
-      verifiable digital signature for every message you choose to sign.</p>
-  </li>
-</ul>
-
-<h3 id="how_encryption_works">How Encryption Works</h3>
-
-<p>To encrypt an email message, you must have an
-  <a href="glossary.xhtml#encryption_certificate">encryption certificate</a>
-  for each of the message&apos;s recipients. The public key in each certificate
-  is used to encrypt the message for that recipient.</p>
-
-<p>If you don&apos;t have a certificate for even a single recipient, the
-  message cannot be encrypted.</p>
-
-<p>The recipient&apos;s software uses the recipient&apos;s private key, which
-  remains on that person&apos;s computer, to decrypt the message.</p>
-  
-<p>[<a href="#signing_and_encrypting_messages">Return to beginning of
-  section</a>]</p>
-
-<h2 id="getting_other_peoples_certificates">Getting Other People&apos;s
-  Certificates</h2>
-
-<p>Every time you send a digitally signed message, your encryption certificate
-  is automatically included with the message. Therefore, one of the easiest
-  ways to obtain someone else&apos;s certificate is for that person to send you
-  a digitally signed message.</p>
-
-<p>When you receive such a message, the person&apos;s certificate is
-  automatically stored by the <a href="certs_help.xhtml">Certificate
-  Manager</a>, which is the part of the browser that keeps track of
-  certificates. This is useful because you need to have a certificate for each
-  recipient of any email message that you want to send in encrypted form.</p>
-
-<p>Another way to obtain certificates is to look them up in a public directory,
-  such as the <q>phonebook</q> directories maintained by many companies.</p>
-
-<p>It&apos;s also possible to look up certificates automatically.  This feature
-  is controlled by
-  <a href="mailnews_preferences.xhtml#addressing_preferences">Mail &amp;
-  Newsgroups Preferences - Addressing</a> or
-  <a href="mailnews_account_settings.xhtml#addressing">Mail &amp; Newsgroups
-  Account Settings - Addressing</a>, which can be configured to look up
-  recipients&apos; email addresses in a directory.</p>
-
-<p>When you are using any account that is configured to look up addresses in a
-  directory, the same directory will be searched for matching certificates when
-  you attempt to send an encrypted message to one or more recipients for whom
-  you don&apos;t have certificates on file.</p>
-
-<p>The directory will also be searched for missing certificates when you open
-  the drop-down menu below the Security icon in the Compose window and choose
-  View Security Info.</p>
-
-<p>[<a href="#signing_and_encrypting_messages">Return to beginning of
-  section</a>]</p>
-
-<h2 id="configuring_security_settings">Configuring Security Settings</h2>
-
-<p>Once you have obtained an email certificate (or certificates), you must
-  specify the certificates you want to use for signing and encrypting
-  messages.</p> 
-
-<p>For information about obtaining email certificates, see
-  <a href="using_certs_help.xhtml#getting_your_own_certificate">Getting Your
-  Own Certificate</a>.</p>
-
-<p>To specify which signing and encryption certificates to use with a
-  particular account, begin from the Mail window:</p>
-
-<ol>
-  <li>Open the Edit menu and choose Mail &amp; Newsgroups Account Settings.</li>
-  <li>Click Security under the name of the mail account whose security settings
-    you want to configure.</li>
-  <li>Under Digital Signing, click Select. (You may be asked to provide your
-    <a href="glossary.xhtml#master_password">Master Password</a> before you can
-    proceed further.)
-
-    <p>A dialog box appears that allows you to select from among your available
-      signing certificates.</p>
-  </li>
-  <li>Choose the signing certificate you want to use, then click OK.</li>
-  <li>Follow the same steps under Encryption: click the Select button, select
-    the encryption certificate you want to use, and click OK.</li>
-
-  <p>In some cases you may be able to specify the same certificate under
-    Encryption that you specified under Digital Signing; check with your system
-    administrator to find out for sure.</p>
-</ol>
-
-<p>Optionally, you can also indicate that you normally want to sign or encrypt
-  all messages sent from a particular account. These account-specific settings
-  are for convenience only; you can override the default settings for
-  individual messages.</p>
-
-<p>To configure your default signing and encryption settings, start from the
-  Security panel for the account (described above) and select your settings as
-  follows:</p>
-
-<ul>
-  <li>Under Digital Signing:
-    <ul>
-      <li><strong>Digitally sign messages</strong>: When this checkbox is
-        selected, all the messages you send from this account will be digitally
-        signed unless you indicate otherwise before you send the message. To
-        turn off this default setting, deselect the checkbox.</li>
-    </ul>
-  </li>
-  <li>Under Encryption (choose one):
-    <ul>
-      <li><strong>Never</strong>: When this option is selected, messages you
-        send from this account will be not be encrypted unless you indicate
-        otherwise before you send them.</li>
-      <li><strong>Required</strong>: When this option is selected, all the
-        messages you send from this account will be encrypted&mdash;but only if
-        you have valid certificates for each of the message&apos;s recipients.
-        If you don&apos;t have all the necessary certificates, the message
-        can&apos;t be sent unless you turn off encryption for that message.</li>
-    </ul>
-  </li>
-</ul>
-
-<p>When you have finished configuring your mail security settings, click OK to
-  confirm them.</p>
- 
-<p>[<a href="#signing_and_encrypting_messages">Return to beginning of
-  section</a>]</p>
-
-<h2 id="signing_and_encrypting_a_new_message">Signing &amp; Encrypting a New
-  Message</h2>
-
-<p>Before you can digitally sign or encrypt any message, you must obtain at
-  least one email certificate and configure your mail security settings
-  correctly. For background information on these tasks, see
-  <a href="#about_digital_signatures_and_encryption">About Digital Signatures
-  &amp; Encryption</a>.</p>
-
-<p>The settings specified in
-  <a href="mailnews_account_settings.xhtml#security">Mail &amp; Newsgroups
-  Account Settings - Security</a> determine the default settings for each new
-  Compose window you open when you set out to write an email.</p>
-
-<p>To open a Compose window, start from the Mail window and click Compose. You
-  can immediately identify the default security settings from the presence or
-  absence of these icons near the lower-right corner of the window:</p>
-
-<table>
-  <tr>
-    <td><img src="chrome://messenger/skin/smime/icons/hdrSignOk.gif"
-      alt="digital signature icon"/></td><td>The message will be digitally
-      signed (assuming you have a valid email certificate that
-      identifies you).</td>
-  </tr>
-  <tr>
-    <td><img src="chrome://messenger/skin/smime/icons/hdrCryptoOk.gif"
-      alt="encryption icon"/></td><td>The message will be encrypted
-      (assuming you have valid certificates for all recipients).</td>
-  </tr>
-</table>
-
-<p>To turn these settings off or on, click the arrow just below the Security
-  icon in the Mail toolbar near the top of the window. Then select the item you
-  want from the drop-down list:</p>
-
-<ul>
-  <li><strong>Do Not Encrypt This Message</strong>: Choose this to turn off
-    encryption for this message. The message will not be encrypted when it is
-    sent over the Internet.</li>
-  <li><strong>Encrypt This Message</strong>: Choose this to turn on encryption
-    for this message. The message will be sent in encrypted form. However, it
-    can&apos;t be sent unless you have valid certificates for all
-    recipients.</li>
-  <li><strong>Digitally Sign This Message</strong>: Choose this to turn digital
-    signing on or off for this message. A checkmark indicates the message will
-    be signed.</li> 
-  <li><strong>View Security Info</strong>: Choose this to view detailed
-    information about the security status of this message&mdash;to help you
-    determine, for example, whether you need to obtain a certificate for one of
-    the recipients.</li>
-</ul>
-
-<p>To view detailed information about the message&apos;s security status, you
-  can also click the key or lock icon as described in
-  <a href="#message_security_compose_window">Message Security - Compose
-  Window</a>.</p>
-
-<p>[<a href="#signing_and_encrypting_messages">Return to beginning of
-  section</a>]</p>
-
-<h2 id="reading_signed_and_encrypted_messages">Reading Signed &amp; Encrypted
-  Messages</h2>
-
-<p>When you view a signed or encrypted message in the Mail window, these icons
-  near the upper-right corner of the message header indicate the security
-  status of the message:</p>
-  
-<table>
-  <tr>
-    <td><img src="chrome://messenger/skin/smime/icons/hdrSignOk.gif"
-      alt="digital signature icon"/></td><td>The message is digitally
-      signed and has been validated. If there is a problem with the signature,
-      the pen is broken.</td>
-  </tr>
-  <tr>
-    <td><img src="chrome://messenger/skin/smime/icons/hdrSignUnknown.gif"
-      alt="unknown icon"/></td><td>The message is signed, but it has a
-      large attachment that has not yet been downloaded from the IMAP server.
-      As a result, the signature cannot be validated. Click the icon to
-      download the attachment and validate the signature.</td>
-  </tr>
-  <tr>
-    <td><img src="chrome://messenger/skin/smime/icons/hdrCryptoOk.gif"
-      alt="encryption icon"/></td><td>The message is encrypted. If there
-      is a problem with the encryption, the key is broken.</td>
-  </tr>
-</table>
-
-<p>For information about certificate validation, see
-  <a href="using_certs_help.xhtml#controlling_validation">Controlling
-  Validation</a>.</p>
-
-<p>To see more detailed information about the message&apos;s security, click
-  the key or lock icon, or follow the instructions in
-  <a href="#message_security_received_message">Message Security - Received
-  Message</a>.</p>
-
-<p>[<a href="#signing_and_encrypting_messages">Return to beginning of
-  section</a>]</p>
-
-<h2 id="message_security_compose_window">Message Security - Compose Window</h2>
-
-<p>This section describes the Message Security window that you can open for any
-  message you are composing. If you&apos;re not already viewing Message
-  Security, click the Security icon in the toolbar of the Compose window.</p>
-
-<p>The Message Security window describes how your message will be sent:</p>
-
-<ul>
-  <li><strong>Digitally Signed</strong>: This line describes whether your
-    message will be signed. There are three possibilities:
-    <ul>
-      <li><strong>Yes</strong>: Digital signing has been enabled for this
-        message, you have a valid certificate identifying you, and the message
-        can be signed.</li>
-      <li><strong>No</strong>: Digital signing has been disabled for this
-        message.</li>
-      <li><strong>Not possible</strong>: Digital signing has been enabled for
-        this message. However, a valid
-        <a href="glossary.xhtml#certificate">certificate</a> identifying you
-        for this purpose is not available, or there is some other problem that
-        makes signing impossible.</li>
-    </ul>
-  </li>
-  <li><strong>Encrypted</strong>: This line describes whether your message will
-    be encrypted. There are three possibilities:
-    <ul>
-      <li><strong>Yes</strong>: Encryption has been enabled for this message,
-        valid certificates for all listed recipients are available, and the
-        message can be encrypted.</li>
-      <li><strong>No</strong>: Encryption has been disabled or is not possible
-        for this message.</li>
-      <li><strong>Not possible</strong>: Encryption has been enabled for this
-        message. However, a valid certificate for at least one of the listed
-        recipients is not available, or no recipients are listed, or there is
-        some other problem that makes encryption impossible.</li>
-    </ul>
-  </li>
-</ul>
-
-<p>The Message Security window also lists the certificates available for the
-  recipients of your message:</p>
-
-<ul>
-  <li><strong>View</strong>: To view the details for any certificate in the
-    list, select its name, then click View.</li>
-</ul>
-
-<p>For more information about obtaining certificates and configuring message
-  security settings, see <a href="#signing_and_encrypting_messages">Signing
-  &amp; Encrypting Messages</a>.</p>
-
-<p>To indicate your signing or encryption choices for an individual message,
-  click the arrow beside the Security button in the Compose window, then select
-  the options you want.</p>
-
-<p>To indicate your default signing and encryption preferences for all
-  messages, see <a href="mailnews_account_settings.xhtml#security">Mail &amp;
-  Newsgroups Account Settings - Security</a></p>
-
-<p>[<a href="#signing_and_encrypting_messages">Return to beginning of
-  section</a>]</p>
-
-<h2 id="message_security_received_message">Message Security - Received
-  Message</h2>
-
-<p>This section describes the Message Security window that you can open for any
-  message you have received. If you&apos;re not already viewing Message
-  Security for a received message, follow these steps:</p>
-
-<ol>
-  <li>In the Mail window, select the message for which you want to view
-    security information.</li>
-  <li>Open the View menu and choose Message Security Info.</li>
-</ol>
-
-<p>The Message Security window displays the following information:</p>
-
-<ul>
-  <li><strong>Digital Signature</strong>: The top section describes whether the
-    message is digitally signed and if so, whether the signature is valid.</li>
-  
-  <p>If validation failed while OCSP was enabled, check the OCSP settings in
-    <a href="validation_help.xhtml#privacy_and_security_preferences_validation">Privacy
-    &amp; Security Preferences - Validation</a>. If you are not familiar with
-    OCSP, confirm the settings with your system administrator. If your settings
-    are correct, there may be a problem with the OCSP service or the
-    certificate used to create the signature is no longer valid.</p>
-  
-  <p>If the signature is invalid because of a problem with a certificate&apos;s
-    trust settings, you can use the <a href="certs_help.xhtml">Certificate
-    Manager</a> to view or edit those settings.</p>
-
-  <li><strong>View Signature Certificate</strong>: If the message is signed,
-    click this button to view the certificate that was used to sign it.</li>
-  <li><strong>Encryption</strong>: The bottom section reports whether the
-    message is encrypted and any decrypting problems.
-    <ul>
-      <li>If the message&apos;s contents have been altered during transit, you
-        should ask the sender to resend it. The changes may have been caused by
-        network problems.</li>
-      <li>If a copy of your own certificate (used by the sender to encrypt the
-        message) is not available on your computer, the private key required to
-        decrypt the message cannot be retrieved. The only solution is to import
-        a backup copy of your certificate and its private key (see
-        <a href="certs_help.xhtml#your_certificates">Your Certificates</a> for
-        details.) If you don&apos;t have access to a backup certificate, you
-        will not be able to decrypt the message.</li>
-    </ul>
-  </li>
-</ul>
-
-<p>[<a href="#signing_and_encrypting_messages">Return to beginning of
-  section</a>]</p>
-
-</body>
-</html>
--- a/suite/chrome/common/help/mailnews_account_settings.xhtml
+++ b/suite/chrome/common/help/mailnews_account_settings.xhtml
@@ -899,17 +899,18 @@
 <p>[<a href="#mail_and_newsgroups_account_settings">Return to beginning of
   section</a>]</p>
 
 <h2 id="security">Mail &amp; Newsgroups Account Settings - Security</h2>
 
 <p>This section describes how to configure the Mail &amp; Newsgroup Account
   Settings that control mail message security. Before you do so, however, you
   must obtain one or more mail certificates. For details, see
-  <a href="mail_sec_help.xhtml">Signing &amp; Encrypting Messages</a>.</p>
+  <a href="mailnews_security.xhtml">Signing &amp; Encrypting
+  Messages</a>.</p>
 
 <p>If you are not already viewing the Security settings for your mail account,
   begin from the Mail window:</p>
 
 <ol>
   <li>Open the Edit menu and choose Mail &amp; Newsgroups Account
     Settings.</li>
   <li>Click Security under the name of the mail account whose security settings
@@ -963,18 +964,18 @@
 
 <p>Regardless of whether the <q>Digitally sign messages</q> checkbox is
   selected here, you can change your mind before you send an individual
   message.</p>
 
 <p>To change the digital signature setting for a message you are writing in
   the Compose window, click the arrow below the Security icon near the top of
   the window and select or deselect <q>Digital Sign This Message</q>. For
-  details, see
-  <a href="mail_sec_help.xhtml#signing_and_encrypting_a_new_message">Signing
+  details, see <a
+  href="mailnews_security.xhtml#signing_and_encrypting_a_new_message">Signing
   &amp; Encrypting a New Message.</a></p>
 
 <h3 id="encryption">Encryption</h3>
 
 <p>You use the Encryption area in the <a href="#security">Security panel</a> to
   specify how you routinely want to use encryption when sending your
   messages:</p>
 
@@ -991,18 +992,18 @@
     that message only.</li>
 </ul>
 
 <p>Regardless of which encryption option you select, you can change your mind
   before you send an individual message.</p>
 
 <p>To change the encryption setting for a message you are writing in the
   Compose window, click the arrow below the Security icon near the top of the
-  window and choose the encryption setting you want. For details, see
-  <a href="mail_sec_help.xhtml#signing_and_encrypting_a_new_message">Signing
+  window and choose the encryption setting you want. For details, see <a
+  href="mailnews_security.xhtml#signing_and_encrypting_a_new_message">Signing
   &amp; Encrypting a New Message.</a></p>
 
 <p>[<a href="#mail_and_newsgroups_account_settings">Return to beginning of
   section</a>]</p>
 
 <h2 id="local_folders">Mail &amp; Newsgroups Account Settings - Local
   Folders</h2>
 
new file mode 100644
--- /dev/null
+++ b/suite/chrome/common/help/mailnews_security.xhtml
@@ -0,0 +1,455 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
+  "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"[
+  <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" >
+  %brandDTD;
+]>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Signing &amp; Encrypting Messages</title>
+<link rel="stylesheet" href="helpFileLayout.css"
+  type="text/css"/>
+</head>
+<body>
+
+<h1 id="signing_and_encrypting_messages">Signing &amp; Encrypting Messages</h1>
+
+<div class="contentsBox">In this section:
+  <ul>
+    <li><a href="#about_digital_signatures_and_encryption">About Digital
+      Signatures &amp; Encryption</a></li>
+    <li><a href="#getting_other_peoples_certificates">Getting Other
+      People&apos;s Certificates</a></li>
+    <li><a href="#configuring_security_settings">Configuring Security
+      Settings</a></li>
+    <li><a href="#signing_and_encrypting_a_new_message">Signing &amp;
+      Encrypting a New Message</a></li>
+    <li><a href="#reading_signed_and_encrypted_messages">Reading Signed &amp;
+      Encrypted Messages</a></li>
+    <li><a href="#message_security_compose_window">Message Security -
+      Compose Window</a></li>
+    <li><a href="#message_security_received_message">Message Security -
+      Received Message</a></li>
+  </ul>
+</div>
+
+<h2 id="about_digital_signatures_and_encryption">About Digital Signatures &amp;
+  Encryption </h2>
+
+<p>When you compose a mail message, you can choose to attach your digital
+  signature to it. A <a href="glossary.xhtml#digital_signature">digital
+  signature</a> allows recipients of the message to verify that the message
+  really comes from you and hasn&apos;t been tampered with since you sent
+  it.</p>
+
+<p>When you compose a mail message, you can also choose to encrypt it.
+  <a href="glossary.xhtml#encryption">Encryption</a> makes it very difficult
+  for anyone other than the intended recipient to read the message while it is
+  in transit over the Internet.</p>
+
+<p>Signing and encryption are not available for newsgroup messages.</p>
+
+<p>Before you can sign or encrypt a message, you must take these preliminary
+  steps:</p>
+
+<ol>
+  <li>Obtain one or more <a href="glossary.xhtml#certificate">certificates</a>
+    (the digital equivalents of ID cards). For details, see
+    <a href="using_certs_help.xhtml#getting_your_own_certificate">Getting Your
+    Own Certificate</a>.</li>
+  <li>Configure the security settings for your email account. For details, see
+    <a href="mailnews_account_settings.xhtml#security">Configuring Your
+    Security Settings</a>.
+  </li>
+</ol>
+
+<p>Once you have completed these steps, you can complete the instructions in
+  <a href="#signing_and_encrypting_a_new_message">Signing &amp; Encrypting a 
+  New Message</a>.</p>
+
+<p>The sections that follow provide a brief overview of how digital signatures
+  and encryption work. For more technical details on this subject, see the
+  online document
+  <a href="http://developer.mozilla.org/en/docs/Introduction_to_Public-Key_Cryptography">Introduction
+  to Public-Key Cryptography</a>.</p>
+
+<h3 id="how_digital_signatures_work">How Digital Signatures Work</h3>
+
+<p>A digital signature is a special code, unique to each message, created by
+  means of <a href="glossary.xhtml#public-key_cryptography">public-key
+  cryptography</a>.</p>
+
+<p>A digital signature is completely different from a handwritten signature,
+  although it can sometimes be used for similar legal purposes, such as signing
+  a contract.</p>
+
+<p>To create a digital signature for an email message that you are sending, you
+  need two things:</p>
+
+<ul>
+  <li>A <a href="glossary.xhtml#signing_certificate">signing certificate</a>
+    that identifies you for this purpose. Every time you sign a message, your
+    signing certificate is included with the message. The certificate includes
+    a <a href="glossary.xhtml#public_key">public key</a>. The presence of the
+    certificate in the message permits the recipient to verify your digital
+    signature.
+
+    <p>Your certificate is a bit like your name and phone number in the
+      phonebook&mdash;it is public information that helps other people
+      communicate with you.</p>
+  </li>
+  <li>A <a href="glossary.xhtml#private_key">private key</a>, which is created
+    and stored on your computer when you first obtain a certificate.
+
+    <p>Your private key for a signing certificate is protected by your
+      <a href="glossary.xhtml#master_password">Master Password</a>, and the
+      &brandShortName; program does not disclose it to anyone else. The Mail
+      &amp; Newsgroup software uses your private key to create a unique,
+      verifiable digital signature for every message you choose to sign.</p>
+  </li>
+</ul>
+
+<h3 id="how_encryption_works">How Encryption Works</h3>
+
+<p>To encrypt an email message, you must have an
+  <a href="glossary.xhtml#encryption_certificate">encryption certificate</a>
+  for each of the message&apos;s recipients. The public key in each certificate
+  is used to encrypt the message for that recipient.</p>
+
+<p>If you don&apos;t have a certificate for even a single recipient, the
+  message cannot be encrypted.</p>
+
+<p>The recipient&apos;s software uses the recipient&apos;s private key, which
+  remains on that person&apos;s computer, to decrypt the message.</p>
+  
+<p>[<a href="#signing_and_encrypting_messages">Return to beginning of
+  section</a>]</p>
+
+<h2 id="getting_other_peoples_certificates">Getting Other People&apos;s
+  Certificates</h2>
+
+<p>Every time you send a digitally signed message, your encryption certificate
+  is automatically included with the message. Therefore, one of the easiest
+  ways to obtain someone else&apos;s certificate is for that person to send you
+  a digitally signed message.</p>
+
+<p>When you receive such a message, the person&apos;s certificate is
+  automatically stored by the <a href="certs_help.xhtml">Certificate
+  Manager</a>, which is the part of the browser that keeps track of
+  certificates. This is useful because you need to have a certificate for each
+  recipient of any email message that you want to send in encrypted form.</p>
+
+<p>Another way to obtain certificates is to look them up in a public directory,
+  such as the <q>phonebook</q> directories maintained by many companies.</p>
+
+<p>It&apos;s also possible to look up certificates automatically.  This feature
+  is controlled by
+  <a href="mailnews_preferences.xhtml#addressing_preferences">Mail &amp;
+  Newsgroups Preferences - Addressing</a> or
+  <a href="mailnews_account_settings.xhtml#addressing">Mail &amp; Newsgroups
+  Account Settings - Addressing</a>, which can be configured to look up
+  recipients&apos; email addresses in a directory.</p>
+
+<p>When you are using any account that is configured to look up addresses in a
+  directory, the same directory will be searched for matching certificates when
+  you attempt to send an encrypted message to one or more recipients for whom
+  you don&apos;t have certificates on file.</p>
+
+<p>The directory will also be searched for missing certificates when you open
+  the drop-down menu below the Security icon in the Compose window and choose
+  View Security Info.</p>
+
+<p>[<a href="#signing_and_encrypting_messages">Return to beginning of
+  section</a>]</p>
+
+<h2 id="configuring_security_settings">Configuring Security Settings</h2>
+
+<p>Once you have obtained an email certificate (or certificates), you must
+  specify the certificates you want to use for signing and encrypting
+  messages.</p> 
+
+<p>For information about obtaining email certificates, see
+  <a href="using_certs_help.xhtml#getting_your_own_certificate">Getting Your
+  Own Certificate</a>.</p>
+
+<p>To specify which signing and encryption certificates to use with a
+  particular account, begin from the Mail window:</p>
+
+<ol>
+  <li>Open the Edit menu and choose Mail &amp; Newsgroups Account Settings.</li>
+  <li>Click Security under the name of the mail account whose security settings
+    you want to configure.</li>
+  <li>Under Digital Signing, click Select. (You may be asked to provide your
+    <a href="glossary.xhtml#master_password">Master Password</a> before you can
+    proceed further.)
+
+    <p>A dialog box appears that allows you to select from among your available
+      signing certificates.</p>
+  </li>
+  <li>Choose the signing certificate you want to use, then click OK.</li>
+  <li>Follow the same steps under Encryption: click the Select button, select
+    the encryption certificate you want to use, and click OK.</li>
+
+  <p>In some cases you may be able to specify the same certificate under
+    Encryption that you specified under Digital Signing; check with your system
+    administrator to find out for sure.</p>
+</ol>
+
+<p>Optionally, you can also indicate that you normally want to sign or encrypt
+  all messages sent from a particular account. These account-specific settings
+  are for convenience only; you can override the default settings for
+  individual messages.</p>
+
+<p>To configure your default signing and encryption settings, start from the
+  Security panel for the account (described above) and select your settings as
+  follows:</p>
+
+<ul>
+  <li>Under Digital Signing:
+    <ul>
+      <li><strong>Digitally sign messages</strong>: When this checkbox is
+        selected, all the messages you send from this account will be digitally
+        signed unless you indicate otherwise before you send the message. To
+        turn off this default setting, deselect the checkbox.</li>
+    </ul>
+  </li>
+  <li>Under Encryption (choose one):
+    <ul>
+      <li><strong>Never</strong>: When this option is selected, messages you
+        send from this account will be not be encrypted unless you indicate
+        otherwise before you send them.</li>
+      <li><strong>Required</strong>: When this option is selected, all the
+        messages you send from this account will be encrypted&mdash;but only if
+        you have valid certificates for each of the message&apos;s recipients.
+        If you don&apos;t have all the necessary certificates, the message
+        can&apos;t be sent unless you turn off encryption for that message.</li>
+    </ul>
+  </li>
+</ul>
+
+<p>When you have finished configuring your mail security settings, click OK to
+  confirm them.</p>
+ 
+<p>[<a href="#signing_and_encrypting_messages">Return to beginning of
+  section</a>]</p>
+
+<h2 id="signing_and_encrypting_a_new_message">Signing &amp; Encrypting a New
+  Message</h2>
+
+<p>Before you can digitally sign or encrypt any message, you must obtain at
+  least one email certificate and configure your mail security settings
+  correctly. For background information on these tasks, see
+  <a href="#about_digital_signatures_and_encryption">About Digital Signatures
+  &amp; Encryption</a>.</p>
+
+<p>The settings specified in
+  <a href="mailnews_account_settings.xhtml#security">Mail &amp; Newsgroups
+  Account Settings - Security</a> determine the default settings for each new
+  Compose window you open when you set out to write an email.</p>
+
+<p>To open a Compose window, start from the Mail window and click Compose. You
+  can immediately identify the default security settings from the presence or
+  absence of these icons near the lower-right corner of the window:</p>
+
+<table>
+  <tr>
+    <td><img src="chrome://messenger/skin/smime/icons/hdrSignOk.gif"
+      alt="digital signature icon"/></td><td>The message will be digitally
+      signed (assuming you have a valid email certificate that
+      identifies you).</td>
+  </tr>
+  <tr>
+    <td><img src="chrome://messenger/skin/smime/icons/hdrCryptoOk.gif"
+      alt="encryption icon"/></td><td>The message will be encrypted
+      (assuming you have valid certificates for all recipients).</td>
+  </tr>
+</table>
+
+<p>To turn these settings off or on, click the arrow just below the Security
+  icon in the Mail toolbar near the top of the window. Then select the item you
+  want from the drop-down list:</p>
+
+<ul>
+  <li><strong>Do Not Encrypt This Message</strong>: Choose this to turn off
+    encryption for this message. The message will not be encrypted when it is
+    sent over the Internet.</li>
+  <li><strong>Encrypt This Message</strong>: Choose this to turn on encryption
+    for this message. The message will be sent in encrypted form. However, it
+    can&apos;t be sent unless you have valid certificates for all
+    recipients.</li>
+  <li><strong>Digitally Sign This Message</strong>: Choose this to turn digital
+    signing on or off for this message. A checkmark indicates the message will
+    be signed.</li> 
+  <li><strong>View Security Info</strong>: Choose this to view detailed
+    information about the security status of this message&mdash;to help you
+    determine, for example, whether you need to obtain a certificate for one of
+    the recipients.</li>
+</ul>
+
+<p>To view detailed information about the message&apos;s security status, you
+  can also click the key or lock icon as described in
+  <a href="#message_security_compose_window">Message Security - Compose
+  Window</a>.</p>
+
+<p>[<a href="#signing_and_encrypting_messages">Return to beginning of
+  section</a>]</p>
+
+<h2 id="reading_signed_and_encrypted_messages">Reading Signed &amp; Encrypted
+  Messages</h2>
+
+<p>When you view a signed or encrypted message in the Mail window, these icons
+  near the upper-right corner of the message header indicate the security
+  status of the message:</p>
+  
+<table>
+  <tr>
+    <td><img src="chrome://messenger/skin/smime/icons/hdrSignOk.gif"
+      alt="digital signature icon"/></td><td>The message is digitally
+      signed and has been validated. If there is a problem with the signature,
+      the pen is broken.</td>
+  </tr>
+  <tr>
+    <td><img src="chrome://messenger/skin/smime/icons/hdrSignUnknown.gif"
+      alt="unknown icon"/></td><td>The message is signed, but it has a
+      large attachment that has not yet been downloaded from the IMAP server.
+      As a result, the signature cannot be validated. Click the icon to
+      download the attachment and validate the signature.</td>
+  </tr>
+  <tr>
+    <td><img src="chrome://messenger/skin/smime/icons/hdrCryptoOk.gif"
+      alt="encryption icon"/></td><td>The message is encrypted. If there
+      is a problem with the encryption, the key is broken.</td>
+  </tr>
+</table>
+
+<p>For information about certificate validation, see
+  <a href="using_certs_help.xhtml#controlling_validation">Controlling
+  Validation</a>.</p>
+
+<p>To see more detailed information about the message&apos;s security, click
+  the key or lock icon, or follow the instructions in
+  <a href="#message_security_received_message">Message Security - Received
+  Message</a>.</p>
+
+<p>[<a href="#signing_and_encrypting_messages">Return to beginning of
+  section</a>]</p>
+
+<h2 id="message_security_compose_window">Message Security - Compose Window</h2>
+
+<p>This section describes the Message Security window that you can open for any
+  message you are composing. If you&apos;re not already viewing Message
+  Security, click the Security icon in the toolbar of the Compose window.</p>
+
+<p>The Message Security window describes how your message will be sent:</p>
+
+<ul>
+  <li><strong>Digitally Signed</strong>: This line describes whether your
+    message will be signed. There are three possibilities:
+    <ul>
+      <li><strong>Yes</strong>: Digital signing has been enabled for this
+        message, you have a valid certificate identifying you, and the message
+        can be signed.</li>
+      <li><strong>No</strong>: Digital signing has been disabled for this
+        message.</li>
+      <li><strong>Not possible</strong>: Digital signing has been enabled for
+        this message. However, a valid
+        <a href="glossary.xhtml#certificate">certificate</a> identifying you
+        for this purpose is not available, or there is some other problem that
+        makes signing impossible.</li>
+    </ul>
+  </li>
+  <li><strong>Encrypted</strong>: This line describes whether your message will
+    be encrypted. There are three possibilities:
+    <ul>
+      <li><strong>Yes</strong>: Encryption has been enabled for this message,
+        valid certificates for all listed recipients are available, and the
+        message can be encrypted.</li>
+      <li><strong>No</strong>: Encryption has been disabled or is not possible
+        for this message.</li>
+      <li><strong>Not possible</strong>: Encryption has been enabled for this
+        message. However, a valid certificate for at least one of the listed
+        recipients is not available, or no recipients are listed, or there is
+        some other problem that makes encryption impossible.</li>
+    </ul>
+  </li>
+</ul>
+
+<p>The Message Security window also lists the certificates available for the
+  recipients of your message:</p>
+
+<ul>
+  <li><strong>View</strong>: To view the details for any certificate in the
+    list, select its name, then click View.</li>
+</ul>
+
+<p>For more information about obtaining certificates and configuring message
+  security settings, see <a href="#signing_and_encrypting_messages">Signing
+  &amp; Encrypting Messages</a>.</p>
+
+<p>To indicate your signing or encryption choices for an individual message,
+  click the arrow beside the Security button in the Compose window, then select
+  the options you want.</p>
+
+<p>To indicate your default signing and encryption preferences for all
+  messages, see <a href="mailnews_account_settings.xhtml#security">Mail &amp;
+  Newsgroups Account Settings - Security</a></p>
+
+<p>[<a href="#signing_and_encrypting_messages">Return to beginning of
+  section</a>]</p>
+
+<h2 id="message_security_received_message">Message Security - Received
+  Message</h2>
+
+<p>This section describes the Message Security window that you can open for any
+  message you have received. If you&apos;re not already viewing Message
+  Security for a received message, follow these steps:</p>
+
+<ol>
+  <li>In the Mail window, select the message for which you want to view
+    security information.</li>
+  <li>Open the View menu and choose Message Security Info.</li>
+</ol>
+
+<p>The Message Security window displays the following information:</p>
+
+<ul>
+  <li><strong>Digital Signature</strong>: The top section describes whether the
+    message is digitally signed and if so, whether the signature is valid.</li>
+  
+  <p>If validation failed while OCSP was enabled, check the OCSP settings in
+    <a href="validation_help.xhtml#privacy_and_security_preferences_validation">Privacy
+    &amp; Security Preferences - Validation</a>. If you are not familiar with
+    OCSP, confirm the settings with your system administrator. If your settings
+    are correct, there may be a problem with the OCSP service or the
+    certificate used to create the signature is no longer valid.</p>
+  
+  <p>If the signature is invalid because of a problem with a certificate&apos;s
+    trust settings, you can use the <a href="certs_help.xhtml">Certificate
+    Manager</a> to view or edit those settings.</p>
+
+  <li><strong>View Signature Certificate</strong>: If the message is signed,
+    click this button to view the certificate that was used to sign it.</li>
+  <li><strong>Encryption</strong>: The bottom section reports whether the
+    message is encrypted and any decrypting problems.
+    <ul>
+      <li>If the message&apos;s contents have been altered during transit, you
+        should ask the sender to resend it. The changes may have been caused by
+        network problems.</li>
+      <li>If a copy of your own certificate (used by the sender to encrypt the
+        message) is not available on your computer, the private key required to
+        decrypt the message cannot be retrieved. The only solution is to import
+        a backup copy of your certificate and its private key (see
+        <a href="certs_help.xhtml#your_certificates">Your Certificates</a> for
+        details.) If you don&apos;t have access to a backup certificate, you
+        will not be able to decrypt the message.</li>
+    </ul>
+  </li>
+</ul>
+
+<p>[<a href="#signing_and_encrypting_messages">Return to beginning of
+  section</a>]</p>
+
+</body>
+</html>
--- a/suite/chrome/common/help/privacy_help.xhtml
+++ b/suite/chrome/common/help/privacy_help.xhtml
@@ -17,17 +17,17 @@
 <h1 id="using_privacy_features">Používame funkcie na ochranu súkromia</h1>
 
 <p>Tento prehliadača obsahuje množstvo funkcií, pomocou ktorých môžete zvýšiť
   bezpečnosť vašich súkromných údajov. Nasledujúce kapitoly popisujú,
   ako môže tento prehliadač počas prehliadania webu spracovávať cookies,
   heslá a obrázky.</p>
 
 <p>Informácie o ďalších bezpečnostných funkciách &brandShortName; nájdete v kapitolách
-  <a href="mail_sec_help.xhtml">Podpisovanie a šifrovanie e-mailových správ</a> a
+  <a href="mailnews_security.xhtml">Podpisovanie a šifrovanie e-mailových správ</a> a
   <a href="using_certs_help.xhtml">Používame certifikáty</a>.</p>
 
 <div class="contentsBox">Témy o ochrane súkromia:
   <ul>
     <li><a href="#privacy_on_the_internet">Súkromie na internete</a></li>
     <li><a href="using_priv_help.xhtml#using_the_cookie_manager">Používame Správcu
     cookies</a></li>
     <li><a href="using_priv_help.xhtml#using_the_password_manager">Používame Správcu
--- a/suite/chrome/common/help/suite-toc.rdf
+++ b/suite/chrome/common/help/suite-toc.rdf
@@ -147,17 +147,17 @@
         <rdf:li> <rdf:Description ID="mail-doc-attach"  nc:name="Using Attachments" nc:link="mailnews_using_mail.xhtml#using_attachments" /> </rdf:li>
         <rdf:li> <rdf:Description ID="mail-doc-delete" nc:name="Deleting Messages" nc:link="mailnews_using_mail.xhtml#deleting_messages" /> </rdf:li>
         <rdf:li> <rdf:Description ID="mail-doc-address" nc:name="Using Address Books" nc:link="mailnews_addressbooks.xhtml#using_address_books" /> </rdf:li>
         <rdf:li> <rdf:Description ID="mail-doc-folders" nc:name="Organizing Your Messages" nc:link="mailnews_organizing.xhtml#organizing_your_messages" /> </rdf:li>
         <rdf:li> <rdf:Description ID="mail-junk" nc:name="Controlling Junk Mail" nc:link="mailnews_organizing.xhtml#controlling_junk_mail" /> </rdf:li>
         <rdf:li> <rdf:Description ID="mail-doc-news" nc:name="Getting Started With Newsgroups" nc:link="mailnews_newsgroups.xhtml#getting_started_with_newsgroups" /> </rdf:li>
         <rdf:li> <rdf:Description ID="mail-doc-blogs" nc:name="Getting Started With Blogs &amp; News Feeds" nc:link="mailnews_blogs_and_feeds.xhtml#getting_started_with_blogs_and_news_feeds" /> </rdf:li>
         <rdf:li> <rdf:Description ID="mail-doc-offline" nc:name="Working Offline" nc:link="mailnews_offline.xhtml#working_offline" /> </rdf:li>
-        <rdf:li> <rdf:Description ID="sign-encrypt" nc:name="Signing &amp; Encrypting Messages" nc:link="mail_sec_help.xhtml#signing_and_encrypting_messages" /> </rdf:li>
+        <rdf:li> <rdf:Description ID="sign-encrypt" nc:name="Signing &amp; Encrypting Messages" nc:link="mailnews_security.xhtml#signing_and_encrypting_messages" /> </rdf:li>
         <rdf:li> <rdf:Description ID="mail-doc-account-settings" nc:name="Mail &amp; Newsgroups Account Settings" nc:link="mailnews_account_settings.xhtml#mail_and_newsgroups_account_settings" /> </rdf:li>
         <rdf:li> <rdf:Description ID="mail-doc-mailprefs" nc:name="Mail &amp; Newsgroup Preferences" nc:link="mailnews_preferences.xhtml#mail_and_newsgroup_preferences" /> </rdf:li>
       </rdf:Seq>
     </nc:subheadings>
   </rdf:Description>
 
 
  <rdf:Description about="#mail-doc">
@@ -415,32 +415,32 @@
         <rdf:li> <rdf:Description ID="mail-offline-go" nc:name="Working Offline and Reconnecting Later" nc:link="mailnews_offline.xhtml#working_offline_and_reconnecting_later"/> </rdf:li>
       </rdf:Seq>
     </nc:subheadings>
   </rdf:Description>
 
 <rdf:Description about="#sign-encrypt">
     <nc:subheadings>
       <rdf:Seq>
-        <rdf:li> <rdf:Description ID="sign-encrypt-about" nc:name="Digital Signatures &amp; Encryption" nc:link="mail_sec_help.xhtml#about_digital_signatures_and_encryption" /> </rdf:li>
-        <rdf:li> <rdf:Description ID="sign-encrypt-get" nc:name="Getting Other People's Certificates" nc:link="mail_sec_help.xhtml#getting_other_peoples_certificates" /> </rdf:li>
-        <rdf:li> <rdf:Description ID="sign-encrypt-config" nc:name="Configuring Security Settings" nc:link="mail_sec_help.xhtml#configuring_security_settings" /> </rdf:li>
-        <rdf:li> <rdf:Description ID="sign-encrypt-signing" nc:name="Signing &amp; Encrypting a New Message" nc:link="mail_sec_help.xhtml#signing_and_encrypting_a_new_message" /> </rdf:li>
-        <rdf:li> <rdf:Description ID="sign-encrypt-read" nc:name="Reading Signed &amp; Encrypted Messages" nc:link="mail_sec_help.xhtml#reading_signed_and_encrypted_messages" /> </rdf:li>
-        <rdf:li> <rdf:Description ID="compose_security" nc:name="Message Security - Compose Window" nc:link="mail_sec_help.xhtml#message_security_compose_window" /> </rdf:li>
-        <rdf:li> <rdf:Description ID="received_security" nc:name="Message Security - Received Message" nc:link="mail_sec_help.xhtml#message_security_received_message" /> </rdf:li>
+        <rdf:li> <rdf:Description ID="sign-encrypt-about" nc:name="Digital Signatures &amp; Encryption" nc:link="mailnews_security.xhtml#about_digital_signatures_and_encryption" /> </rdf:li>
+        <rdf:li> <rdf:Description ID="sign-encrypt-get" nc:name="Getting Other People's Certificates" nc:link="mailnews_security.xhtml#getting_other_peoples_certificates" /> </rdf:li>
+        <rdf:li> <rdf:Description ID="sign-encrypt-config" nc:name="Configuring Security Settings" nc:link="mailnews_security.xhtml#configuring_security_settings" /> </rdf:li>
+        <rdf:li> <rdf:Description ID="sign-encrypt-signing" nc:name="Signing &amp; Encrypting a New Message" nc:link="mailnews_security.xhtml#signing_and_encrypting_a_new_message" /> </rdf:li>
+        <rdf:li> <rdf:Description ID="sign-encrypt-read" nc:name="Reading Signed &amp; Encrypted Messages" nc:link="mailnews_security.xhtml#reading_signed_and_encrypted_messages" /> </rdf:li>
+        <rdf:li> <rdf:Description ID="compose_security" nc:name="Message Security - Compose Window" nc:link="mailnews_security.xhtml#message_security_compose_window" /> </rdf:li>
+        <rdf:li> <rdf:Description ID="received_security" nc:name="Message Security - Received Message" nc:link="mailnews_security.xhtml#message_security_received_message" /> </rdf:li>
       </rdf:Seq>
     </nc:subheadings>
   </rdf:Description>
 
 <rdf:Description about="#sign-encrypt-about">
     <nc:subheadings>
       <rdf:Seq>
-        <rdf:li> <rdf:Description ID="sign-encrypt-about-sig" nc:name="How Digital Signatures Work" nc:link="mail_sec_help.xhtml#how_digital_signatures_work" /> </rdf:li>
-        <rdf:li> <rdf:Description ID="sign-encrypt-about-encrypt" nc:name="How Encryption Works" nc:link="mail_sec_help.xhtml#how_encryption_works" /> </rdf:li>
+        <rdf:li> <rdf:Description ID="sign-encrypt-about-sig" nc:name="How Digital Signatures Work" nc:link="mailnews_security.xhtml#how_digital_signatures_work" /> </rdf:li>
+        <rdf:li> <rdf:Description ID="sign-encrypt-about-encrypt" nc:name="How Encryption Works" nc:link="mailnews_security.xhtml#how_encryption_works" /> </rdf:li>
       </rdf:Seq>
     </nc:subheadings>
   </rdf:Description>
 
 
 <rdf:Description about="#mail-doc-account-settings">
     <nc:subheadings>
       <rdf:Seq>
--- a/suite/chrome/common/notification.properties
+++ b/suite/chrome/common/notification.properties
@@ -18,22 +18,26 @@ xpinstallPromptWarning=%S zabránil tejto stránke (%S) požiadať o inštaláciu softvéru.
 xpinstallPromptInstallButton=Nainštalovať…
 xpinstallPromptInstallButton.accesskey=i
 xpinstallDisabledMessageLocked=Inštalácia softvéru bola vypnutá vašim správcom systému.
 xpinstallDisabledMessage=Inštalácia softvéru je momentálne vypnutá. Kliknite na tlačidlo Povoliť a skúste to znova.
 xpinstallDisabledButton=Povoliť
 xpinstallDisabledButton.accesskey=P
 
 # Geolocation UI
-# LOCALIZATION NOTE (geolocation.shareLocation geolocation.dontShareLocation):
+# LOCALIZATION NOTE (geolocation.shareLocation geolocation.dontShareLocation geolocation.alwaysShare geolocation.neverShare):
 # If you're having trouble with the word Share, please use Allow and Block in your language.
 geolocation.shareLocation=Prezradiť polohu
 geolocation.shareLocation.accesskey=e
 geolocation.dontShareLocation=Neprezradiť
 geolocation.dontShareLocation.accesskey=a
+geolocation.alwaysShareLocation=Vždy prezradiť
+geolocation.alwaysShareLocation.accesskey=V
+geolocation.neverShareLocation=Nikdy neprezradiť
+geolocation.neverShareLocation.accesskey=N
 geolocation.siteWantsToKnow=Stránka %S chce vedieť, kde sa nachádzate.
 geolocation.fileWantsToKnow=Súbor %S chce vedieť, kde sa nachádzate.
 # LOCALIZATION NOTE (geolocation.learnMore): Use the unicode ellipsis char, \u2026,
 # or use "..." unless \u2026 doesn't suit traditions in your locale.
 geolocation.learnMore=Ďalšie informácie…
 geolocation.remember=Zapamätať pre túto stránku
 
 # Block autorefresh
--- a/toolkit/chrome/global/aboutSupport.properties
+++ b/toolkit/chrome/global/aboutSupport.properties
@@ -2,16 +2,23 @@
 # Feel free to leave english strings if there are no good translations, these are only used in about:support
 
 # LOCALIZATION NOTE: This can be localized with a more generic term, like
 # "Graphics-accelerated Windows". It describes a number of windows, e.g.:
 # "GPU Accelerated Windows: 2/2 (Direct3D 9)"
 # "GPU Accelerated Windows: 0/2"
 acceleratedWindows = Okná urýchľované pomocou GPU
 
+# LOCALIZATION NOTE The verb "blocked" here refers to a graphics feature such as "Direct2D" or "OpenGL layers".
+# The %1 here is a placeholder, leave unchanged, it will get replaced by the driver version string.
+tryNewerDriverVersion = Blokované kvôli ovládaču grafickej karty. Skúste ho aktualizovať na verziu %1 alebo novišu.
+
+# LOCALIZATION NOTE The verb "blocked" here refers to a graphics feature such as "Direct2D" or "OpenGL layers".
+blockedGraphicsCard = Blokované kvôli nevyriešeným problémom s ovládačom grafickej karty.
+
 direct2DEnabled = Direct2D povolené
 directWriteEnabled = DirectWrite povolené
 adapterDescription = Popis adaptéra
 adapterVendorID = Identifikácia dodávateľa
 adapterDeviceID = Identifikácia zariadenia
 adapterDrivers = Ovládače zariadenia
 adapterRAM = Veľkosť pamäte RAM
 driverVersion = Verzia ovládača
--- a/toolkit/chrome/global/headsUpDisplay.properties
+++ b/toolkit/chrome/global/headsUpDisplay.properties
@@ -104,9 +104,20 @@ NetworkPanel.durationMS=%Sms
 # This string is used to show the duration between the response header and the
 # response body event. It also shows the size of the received or cached image.
 #
 # The first %S is replace by the width of the inspected image.
 # The second %S is replaced by the height of the inspected image.
 # The third %S is replaced by the duration between the response header and the
 # response body event.
 NetworkPanel.imageSizeDeltaDurationMS=%Sx%Spx, Δ%Sms
+# LOCALIZATION NOTE (NetworkPanel.responseBodyUnableToDisplay.content):
+#
+# This string is displayed within the response body section of the NetworkPanel
+# if the content type of the network request can't be displayed in the
+# NetworkPanel. E.g. any kind of text is easy to display, but some audio or
+# flash data received from the server can't be displayed.
+#
+# The %S is replaced by the content type, that can't be displayed, examples are
+#  o application/x-shockwave-flash
+#  o music/crescendo
+NetworkPanel.responseBodyUnableToDisplay.content=Nebolo možné zobraziť odpovede typu "%S"
 ConsoleAPIDisabled=Záznamové API webovej konzoly (console.log, console.info, console.warn, console.error) bolo vypnuté skriptom tejto stránky.
--- a/toolkit/chrome/global/webConsole.dtd
+++ b/toolkit/chrome/global/webConsole.dtd
@@ -5,11 +5,12 @@
 <!ENTITY networkPanel.requestHeaders              "Hlavičky požiadavky">
 <!ENTITY networkPanel.requestCookie               "Odoslané cookie">
 <!ENTITY networkPanel.requestBody                 "Telo požiadavky">
 <!ENTITY networkPanel.requestFormData             "Odoslané údaje formulára">
 
 <!ENTITY networkPanel.responseHeaders             "Hlavičky odpovede">
 <!ENTITY networkPanel.responseBody                "Telo odpovede">
 <!ENTITY networkPanel.responseBodyCached          "Údaje vo vyrovnávacej pamäti">
+<!ENTITY networkPanel.responseBodyUnknownType     "Neznámy typ obsahu">
 <!ENTITY networkPanel.responseNoBody              "Žiadne telo odpovede">
 <!ENTITY networkPanel.responseImage               "Prijatý obrázok">
 <!ENTITY networkPanel.responseImageCached         "Obrázok vo vyrovnávacej pamäti">
--- a/toolkit/chrome/mozapps/extensions/extensions.dtd
+++ b/toolkit/chrome/mozapps/extensions/extensions.dtd
@@ -87,21 +87,21 @@
 <!ENTITY cmd.contribute.tooltip               "Prispieť na vývoj tohto doplnku">
 
 <!ENTITY cmd.showReleaseNotes.label           "Zobraziť poznámky k vydaniu">
 <!ENTITY cmd.showReleaseNotes.tooltip         "Zobraziť poznámky k vydaniu tejto aktualizácie">
 <!ENTITY cmd.hideReleaseNotes.label           "Skryť poznámky k vydaniu">
 <!ENTITY cmd.hideReleaseNotes.tooltip         "Skryť poznámky k vydaniu tejto aktualizácie">
 
 <!-- discovery view -->
-<!-- LOCALIZATION NOTE (discover.title,discover.description,discover.footer):
+<!-- LOCALIZATION NOTE (discover.title,discover.description2,discover.footer):
      Displayed in the center of the Get Add-ons view, see bug 601143 for mockups. -->
 <!ENTITY discover.title                       "Čo sú doplnky?">
-<!ENTITY discover.description                 "Doplnky sú malé aplikácie, ktoré umožňujú prispôsobiť si Firefox pomocou
-  nových funkcií alebo štýlov. Vyskúšajte bočný panel prinášajúci úsporu času, upozorňovanie na predpoveď počasia alebo nový vzhľad, ktorý urobí váš Firefox
+<!ENTITY discover.description2                "Doplnky sú malé aplikácie, ktoré umožňujú prispôsobiť si &brandShortName; pomocou
+  nových funkcií alebo štýlov. Vyskúšajte bočný panel prinášajúci úsporu času, upozorňovanie na predpoveď počasia alebo nový vzhľad, ktorý urobí váš &brandShortName;
   jedinečným.">
 <!ENTITY discover.footer                      "Ak je prehliadač pripojený k internetu, na tomto paneli
   sa zobrazujú najzaujímavejšie a najpopulárnejšie doplnky, ktoré stoja za vyskúšanie.">
 
 <!-- detail view -->
 <!ENTITY detail.version.label                 "Verzia">
 <!ENTITY detail.lastupdated.label             "Naposledy aktualizované">
 <!ENTITY detail.creator.label                 "Vývojár">
--- a/toolkit/chrome/mozapps/update/updates.dtd
+++ b/toolkit/chrome/mozapps/update/updates.dtd
@@ -10,19 +10,21 @@
 <!ENTITY  noupdatesfound.title            "Nenájdené žiadne aktualizácie">
 <!ENTITY  noupdatesautoenabled.intro      "Neboli nájdené žiadne aktualizácie. &brandShortName; bude
                                            pravidelne zisťovať ich dostupnosť.">
 <!ENTITY  noupdatesautodisabled.intro     "Nie sú dostupné žiadne aktualizácie. Skúste to neskôr alebo povoľte
                                            automatickú kontrolu aktualizácií &brandShortName;u.">
 
 <!ENTITY  manualUpdate.title              "Aktualizácia zlyhala">
 <!ENTITY  manualUpdate.desc               "K dispozícii je odporúčaná bezpečnostná a stabilizačná aktualizácia, avšak
-                                           nemáte dostatočné oprávnenia na jej inštaláciu. Prosím, kontaktujte
+                                           na jej inštaláciu nemáte dostatočné oprávnenia. Prosím, kontaktujte
                                            správcu systému alebo ju skúste nainštalovať z používateľského konta,
                                            ktoré umožňuje inštaláciu softvéru v tomto počítači.">
+<!ENTITY  manualUpdate.space.desc         "K dispozícii je odporúčaná bezpečnostná a stabilizačná aktualizácia, avšak
+                                           na jej inštaláciu nemáte dostatočné množstvo voľného miesta na disku.">
 <!ENTITY  manualUpdateGetMsg.label        "Najnovšiu verziu programu &brandShortName; nájdete na adrese:">
 
 <!ENTITY  incompatibleCheck.title         "Kontrola kompatibility doplnkov">
 <!ENTITY  incompatibleCheck.label         "Vyhľadávajú sa nové verzie vašich doplnkov…">
 
 <!ENTITY  clickHere.label                 "Zobraziť ďalšie informácie o tejto aktualizácii">
 
 <!ENTITY  evangelism.desc                 "Dôrazne odporúčame čo najskôr použiť túto aktualizáciu