update
authorsektormaster@atlas.sk
Mon, 02 Aug 2010 14:07:42 +0200
changeset 98 ed13307e234645a9a1204db04b1956d74f6a5260
parent 95 0c840db6f9991eb018ad8c019582ea6e06281b02
child 99 26262c9c955ee0d2791e8a1b2285087130e4bfd4
push id1
push usersledru@mozilla.com
push dateFri, 05 Dec 2014 02:19:11 +0000
update
browser/chrome/browser/aboutSyncTabs.dtd
browser/chrome/browser/browser.dtd
browser/chrome/browser/browser.properties
browser/chrome/browser/openLocation.dtd
browser/chrome/browser/preferences/preferences.dtd
browser/chrome/browser/preferences/preferences.properties
browser/chrome/browser/preferences/sync.dtd
browser/chrome/browser/preferences/tabs.dtd
browser/chrome/browser/syncBrand.dtd
browser/chrome/browser/syncCommon.dtd
browser/chrome/browser/syncGenericChange.properties
browser/chrome/browser/syncSetup.properties
browser/feedback/main.dtd
browser/feedback/main.properties
mail/chrome/messenger/messengercompose/composeMsgs.properties
mail/chrome/messenger/msgHdrViewOverlay.dtd
mobile/chrome/browser.dtd
mobile/chrome/browser.properties
mobile/profile/bookmarks.inc
security/manager/chrome/pippki/pippki.properties
services/sync/errors.properties
services/sync/sync.properties
suite/chrome/browser/navigator.properties
suite/chrome/browser/pageInfo.dtd
suite/chrome/common/help/cs_nav_prefs_advanced.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/mail_help.xhtml
suite/chrome/common/help/mail_sec_help.xhtml
suite/chrome/common/help/nav_help.xhtml
suite/chrome/common/help/privacy_help.xhtml
suite/chrome/common/help/suite-toc.rdf
suite/chrome/common/pref/pref-keynav.dtd
suite/chrome/common/pref/pref-proxies-advanced.dtd
suite/chrome/mailnews/addressbook/abMainWindow.dtd
toolkit/chrome/global/headsUpDisplay.dtd
toolkit/chrome/global/headsUpDisplay.properties
toolkit/chrome/mozapps/extensions/extensions.dtd
toolkit/chrome/mozapps/extensions/extensions.properties
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/aboutSyncTabs.dtd
@@ -0,0 +1,9 @@
+<!ENTITY tabs.otherComputers.label               "Karty z ďalších počítačov">
+
+<!ENTITY tabs.searchText.label                   "Hľadať karty…">
+
+<!ENTITY tabs.context.openTab.label              "Otvoriť túto kartu">
+<!ENTITY tabs.context.openMultipleTabs.label     "Otvoriť označené karty">
+<!ENTITY tabs.context.bookmarkSingleTab.label    "Pridať kartu medzi záložky…">
+<!ENTITY tabs.context.bookmarkMultipleTabs.label "Pridať označené karty medzi záložky…">
+<!ENTITY tabs.context.refreshList.label          "Obnoviť zoznam">
--- a/browser/chrome/browser/browser.dtd
+++ b/browser/chrome/browser/browser.dtd
@@ -7,18 +7,16 @@
 <!ENTITY mainWindow.titlemodifier "&brandFullName;">
 <!-- LOCALIZATION NOTE (mainWindow.titlemodifiermenuseparator): DONT_TRANSLATE -->
 <!ENTITY mainWindow.titlemodifiermenuseparator " - ">
 <!-- LOCALIZATION NOTE (mainWindow.titlePrivateBrowsingSuffix): This will be appended to the window's title
                                                                 inside the private browsing mode -->
 <!ENTITY mainWindow.titlePrivateBrowsingSuffix "(Režim Súkromné prehliadanie)">
 
 <!-- Tab context menu -->
-<!ENTITY  newTab.label                       "Nová karta">
-<!ENTITY  newTab.accesskey                   "N">
 <!ENTITY  reloadTab.label                    "Obnoviť kartu">
 <!ENTITY  reloadTab.accesskey                "O">
 <!ENTITY  reloadAllTabs.label                "Obnoviť všetky karty">
 <!ENTITY  reloadAllTabs.accesskey            "b">
 <!ENTITY  closeOtherTabs.label               "Zavrieť ostatné karty">
 <!ENTITY  closeOtherTabs.accesskey           "a">
 <!ENTITY  openTabInNewWindow.label           "Otvoriť v novom okne">
 <!ENTITY  openTabInNewWindow.accesskey       "k">
@@ -164,24 +162,25 @@
 <!ENTITY downloadsUnix.commandkey "y">
 <!ENTITY addons.label                 "Doplnky">
 <!ENTITY addons.accesskey             "D">
 
 <!ENTITY errorConsoleCmd.label        "Chybová konzola">
 <!ENTITY errorConsoleCmd.accesskey    "C">
 <!ENTITY errorConsoleCmd.commandkey   "j">
 
-<!ENTITY hudConsoleCmd.label          "Vývojárska konzola">
-<!ENTITY hudConsoleCmd.accesskey      "z">
-<!ENTITY hudConsoleCmd.commandkey     "k">
+<!ENTITY webConsoleCmd.label          "Webová konzola">
+<!ENTITY webConsoleCmd.accesskey      "W">
+<!ENTITY webConsoleCmd.commandkey     "k">
 
-<!ENTITY inspectMenu.label            "Preskúmať">
+<!ENTITY inspectMenu.label            "Preskúmať stránku">
 <!ENTITY inspectMenu.accesskey        "e">
 <!ENTITY inspectMenu.commandkey       "I">
 
+<!ENTITY inspectPanelTitle.label      "HTML">
 <!ENTITY inspectButton.label          "Preskúmať">
 <!ENTITY inspectButton.accesskey      "P">
 <!ENTITY inspectNextButton.label      "Ďalšie">
 <!ENTITY inspectNextButton.accesskey  "a">
 <!ENTITY inspectPreviousButton.label  "Predchádzajúce">
 <!ENTITY inspectPreviousButton.accesskey "e">
 <!ENTITY inspectStyleButton.label     "Štýl">
 <!ENTITY inspectStyleButton.accesskey "t">
@@ -253,16 +252,18 @@
 <!ENTITY showAllHistoryCmd.commandkey "H">
 
 <!ENTITY appMenuPrintCmd.label "Tlačiť">
 <!ENTITY appMenuCustomize.label "Prispôsobenie">
 <!ENTITY appMenuToolbarLayout.label "Rozloženie panela nástrojov…">
 <!ENTITY appMenuSidebars.label "Bočné panely">
 <!ENTITY appMenuHelp.label "Pomocník">
 
+<!ENTITY developerMenu.label "Vývojár">
+
 <!ENTITY openCmd.commandkey           "l">
 <!ENTITY urlbar.placeholder           "Prejsť na webovú stránku">
 <!ENTITY urlbar.accesskey             "d">
 <!ENTITY urlbar.switchToTab.label     "Prejsť na kartu:">
 
 <!--
   Comment duplicated from browser-sets.inc:
 
@@ -283,26 +284,26 @@
 
   Do *not* tamper with these values without talking to ben@mozilla.org
 
  -->
 <!ENTITY searchFocus.commandkey        "k">
 <!ENTITY searchFocus.commandkey2       "e">
 <!ENTITY searchFocusUnix.commandkey    "j">
 
+<!ENTITY openLinkCmdInTab.label "Otvoriť odkaz na novej karte">
+<!ENTITY openLinkCmdInTab.accesskey "O">
 <!ENTITY openLinkCmd.label "Otvoriť odkaz v novom okne">
-<!ENTITY openLinkCmd.accesskey "O">
+<!ENTITY openLinkCmd.accesskey "t">
 <!ENTITY openLinkCmdInCurrent.label     "Otvoriť odkaz">
 <!ENTITY openLinkCmdInCurrent.accesskey "d">
-<!ENTITY openLinkCmdInTab.label "Otvoriť odkaz na novej karte">
-<!ENTITY openLinkCmdInTab.accesskey "t">
+<!ENTITY openFrameCmdInTab.label "Otvoriť rámec na novej karte">
+<!ENTITY openFrameCmdInTab.accesskey "k">
 <!ENTITY openFrameCmd.label "Otvoriť rámec v novom okne">
 <!ENTITY openFrameCmd.accesskey "n">
-<!ENTITY openFrameCmdInTab.label "Otvoriť rámec na novej karte">
-<!ENTITY openFrameCmdInTab.accesskey "k">
 <!ENTITY showOnlyThisFrameCmd.label "Zobraziť len tento rámec">
 <!ENTITY showOnlyThisFrameCmd.accesskey "l">
 <!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
@@ -461,17 +462,17 @@ you can use these alternative items. Oth
 <!ENTITY dontShowMessage.accesskey "N">
 
 <!ENTITY bidiSwitchPageDirectionItem.label "Zmeniť smer stránky">
 <!ENTITY bidiSwitchPageDirectionItem.accesskey "m">
 <!ENTITY bidiSwitchTextDirectionItem.label "Zmeniť smer textu">
 <!ENTITY bidiSwitchTextDirectionItem.accesskey "m">
 <!ENTITY bidiSwitchTextDirectionItem.commandkey "X">
 
-<!ENTITY findOnCmd.label "Hľadať na tejto stránke">
+<!ENTITY findOnCmd.label "Hľadať na tejto stránke…">
 <!ENTITY findOnCmd.accesskey "n">
 <!ENTITY findOnCmd.commandkey "f">
 <!ENTITY findAgainCmd.label "Hľadať znova">
 <!ENTITY findAgainCmd.accesskey "d">
 <!ENTITY findAgainCmd.commandkey "g">
 <!ENTITY findAgainCmd.commandkey2 "VK_F3">
 
 <!ENTITY spellAddDictionaries.label "Pridať slovníky…">
@@ -503,8 +504,25 @@ just addresses the organization to follo
 <!ENTITY identity.moreInfoLinkText "Ďalšie informácie…">
 
 <!ENTITY downloadMonitor2.tooltip "Kliknutím otvoríte Správcu preberania súborov">
 
 <!ENTITY allTabs.filter.emptyText "Hľadať v kartách">
 <!-- Name for the tabs toolbar as spoken by screen readers.
      The word "toolbar" is appended automatically and should not be contained below! -->
 <!ENTITY tabsToolbar.label "Karty prehliadača">
+
+<!ENTITY syncTabsMenu.label "Karty z ďalších počítačov">
+
+<!ENTITY syncBrand.shortName.label  "Sync">
+
+<!ENTITY syncMenu.label               "Synchronizácia">
+<!-- LOCALIZATION NOTE (sync.menu.accesskey): This is part of the tools menu, so
+                                              don't use a conflicting access key -->
+<!ENTITY syncMenu.accesskey           "n">
+<!ENTITY syncSetup.label              "Nastaviť službu &syncBrand.shortName.label;…">
+<!ENTITY syncSetup.accesskey          "N">
+<!ENTITY syncLogInItem.label          "Pripojiť">
+<!ENTITY syncLogInItem.accesskey      "P">
+<!ENTITY syncLogOutItem.label         "Odpojiť">
+<!ENTITY syncLogOutItem.accesskey     "O">
+<!ENTITY syncSyncNowItem.label        "Synchronizovať teraz">
+<!ENTITY syncSyncNowItem.accesskey    "S">
--- a/browser/chrome/browser/browser.properties
+++ b/browser/chrome/browser/browser.properties
@@ -39,26 +39,33 @@ xpinstallDisabledButton.accesskey=v
 # #1 first add-on's name, #2 number of add-ons, #3 application name
 addonsInstalled=Doplnok #1 bol úspešne nainštalovaný.;Úspešne boli nainštalované #2 doplnky.;Úspešne bolo nainštalovaných #2 doplnkov.
 addonsInstalledNeedsRestart=Doplnok #1 bude nainštalovaný po reštartovaní prehliadača #3.;Po reštartovaní prehliadača #3 budú nainštalované #2 doplnky.;Po reštartovaní prehliadača #3 bude nainštalovaných #2 doplnkov.
 addonInstallRestartButton=Reštartovať
 addonInstallRestartButton.accesskey=R
 addonInstallManage=Otvoriť Správcu doplnkov
 addonInstallManage.accesskey=d
 
-# LOCALIZATION NOTE (addonError-1, addonError-2, addonError-3, addonError-4, addonErrorIncompatible, addonErrorBlocklisted):
+# LOCALIZATION NOTE (addonError-1, addonError-2, addonError-3, addonError-4):
 # #1 is the add-on name, #2 is the host name, #3 is the application name
 # #4 is the application version
 addonError-1=Doplnok nemohol byť prevzatý kvôli problémom s pripojením k #2.
-addonError-2=Doplnok zo stránky #2 nemohol byť nainštalovaný, pretože nie je taký, aký #3 očakával.
+addonError-2=Doplnok zo stránky #2 nemohol byť nainštalovaný, pretože neodpovedá tomu, čo prehliadač #3 očakával.
 addonError-3=Doplnok prevzatý zo stránky #2 nemohol byť nainštalovaný, pretože je zrejme poškodený.
 addonError-4=Doplnok #1 nemohol byť nainštalovaný, pretože #3 nemohol upraviť potrebný súbor.
 addonErrorIncompatible=Doplnok #1 nemohol byť nainštalovaný, pretože nie je kompatibilný s prehliadačom #3 #4.
 addonErrorBlocklisted=Doplnok #1 nebol byť nainštalovaný, pretože je veľké riziko, že spôsobí problémy so stabilitou alebo bezpečnosťou prehliadača.
 
+# LOCALIZATION NOTE (addonLocalError-1, addonLocalError-2, addonLocalError-3, addonLocalError-4, addonErrorIncompatible, addonErrorBlocklisted):
+# #1 is the add-on name, #3 is the application name, #4 is the application version
+addonLocalError-1=Doplnok nemohol byť nainštalovaný kvôli chybe v súborovom systéme.
+addonLocalError-2=Doplnok nemohol byť nainštalovaný, pretože neodpovedá tomu, čo prehliadač #3 očakával.
+addonLocalError-3=Doplnok nemohol byť nainštalovaný, pretože je zrejme poškodený.
+addonLocalError-4=Doplnok #1 nemohol byť nainštalovaný, pretože #3 nemohol upraviť potrebný súbor.
+
 # LOCALIZATION NOTE (lwthemeInstallRequest.message): %S will be replaced with
 # the host name of the site.
 lwthemeInstallRequest.message=Táto stránka (%S) sa pokúša nainštalovať tému.
 lwthemeInstallRequest.allowButton=Povoliť
 lwthemeInstallRequest.allowButton.accesskey=v
 
 lwthemePostInstallNotification.message=Bola nainštalovaná nová téma.
 lwthemePostInstallNotification.undoButton=Vrátiť späť
--- a/browser/chrome/browser/openLocation.dtd
+++ b/browser/chrome/browser/openLocation.dtd
@@ -1,10 +1,10 @@
 <!-- extracted from content/openLocation.xul -->
 
 <!ENTITY enter.label "Zadajte webovú adresu (URL) alebo lokálny súbor, ktoré chcete otvoriť:">
 <!ENTITY chooseFile.label "Vybrať súbor…">
+<!ENTITY newTab.label "Nová karta">
 <!ENTITY newWindow.label "Nové okno">
-<!ENTITY newTab.label "Nová karta">
 <!ENTITY topTab.label "Aktuálna karta">
 <!ENTITY caption.label "Otvoriť webovú adresu">
 <!ENTITY openWhere.label "Otvoriť kde:">
 <!ENTITY openBtn.label "Otvoriť">
--- a/browser/chrome/browser/preferences/preferences.dtd
+++ b/browser/chrome/browser/preferences/preferences.dtd
@@ -10,8 +10,10 @@
 <!ENTITY  paneGeneral.title       "Všeobecné">
 <!ENTITY  paneTabs.title          "Karty">
 <!ENTITY  paneContent.title       "Obsah">
 <!ENTITY  paneApplications.title  "Aplikácie">
 <!ENTITY  panePrivacy.title       "Súkromie">
 <!ENTITY  paneSecurity.title      "Bezpečnosť">
 <!ENTITY  paneAdvanced.title      "Spresnenie">
 
+<!-- LOCALIZATION NOTE (paneSync.title): This should match syncBrand.shortName.label in ../syncBrand.dtd -->
+<!ENTITY  paneSync.title          "Synchronizácia">
--- a/browser/chrome/browser/preferences/preferences.properties
+++ b/browser/chrome/browser/preferences/preferences.properties
@@ -98,8 +98,17 @@ offlineAppRemoveConfirm=Odstrániť údaje pre režim offline
 # offline application
 #   e.g. offlineAppUsage : "50.23 MB"
 #   %1$S = size (in bytes or megabytes, ...)
 #   %2$S = unit of measure (bytes, KB, MB, ...)
 offlineAppUsage=%1$S %2$S
 
 offlinepermissionstext=Nasledujúce webové stránky sa nebudú pokúšať uložiť údaje pre režim offline.
 offlinepermissionstitle=Údaje pre režim offline
+
+
+#### Syncing
+connect.label=Pripojiť
+disconnect.label=Odpojiť
+
+differentAccount.title=Použiť iný učet?
+differentAccount.label=Týmto vymažete všetky informácie o synchronizačnom účte a takisto nastavenia.
+differentAccountConfirm.label=Vymazať všetky informácie
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/preferences/sync.dtd
@@ -0,0 +1,45 @@
+<!-- The page shown when not logged in... -->
+<!ENTITY setupButton.label          "Nastaviť službu &syncBrand.fullName.label;">
+<!ENTITY setupButton.accesskey      "N">
+<!ENTITY weaveDesc.label            "&syncBrand.fullName.label; vám umožňuje pristupovať k histórii, záložkám, heslám a otvoreným kartám zo všetkých vašich zariadení.">
+
+<!-- The page shown when logged in... -->
+<!ENTITY accountGroupboxCaption.label "Účet služby &syncBrand.fullName.label;">
+<!ENTITY currentUser.label            "Aktuálny používateľ:">
+
+<!-- Login error feedback -->
+<!ENTITY updatePass.label             "Aktualizovať">
+<!ENTITY resetPass.label              "Vynulovať">
+
+<!-- Manage Account -->
+<!ENTITY manageAccount.label          "Spravovať účet">
+<!ENTITY manageAccount.accesskey      "S">
+<!ENTITY changePassword.label         "Zmeniť heslo">
+<!ENTITY changePassphrase.label       "Zmeniť tajnú frázu">
+<!ENTITY resetSync.label              "Nová synchronizácia">
+<!ENTITY differentAccount.label       "Použiť iný účet">
+
+<!-- Sync Settings -->
+<!ENTITY syncPrefsCaption.label       "Synchronizácia prehliadača">
+<!ENTITY syncComputerName.label       "Názov počítača:">
+<!ENTITY syncComputerName.accesskey   "a">
+<!ENTITY syncModeSwitchDesc.label     "&brandShortName; bude: ">
+<!ENTITY syncModeSwitchDesc.accesskey "b">
+<!ENTITY syncEverything.label         "synchronizovať všetko">
+<!ENTITY customSync.label             "používať moje vlastné nastavenia">
+<!ENTITY syncEverythingDescription.label  "Synchronizovať sa budú vaše záložky, história, heslá, nastavenia a otvorené karty.">
+<!ENTITY syncItem.bookmarks.label     "Synchronizovať záložky">
+<!ENTITY syncItem.bookmarks.accesskey "z">
+<!ENTITY syncItem.tabs.label          "Synchronizovať karty">
+<!ENTITY syncItem.tabs.accesskey      "k">
+<!ENTITY syncItem.history.label       "Synchronizovať históriu">
+<!ENTITY syncItem.history.accesskey   "h">
+<!ENTITY syncItem.passwords.label     "Synchronizovať heslá">
+<!ENTITY syncItem.passwords.accesskey "e">
+<!ENTITY syncItem.prefs.label         "Synchronizovať nastavenia">
+<!ENTITY syncItem.prefs.accesskey     "c">
+
+<!-- Footer stuff -->
+
+<!ENTITY prefs.tosLink.label        "Podmienky používania služby">
+<!ENTITY prefs.ppLink.label         "Zásady ochrany súkromia">
--- a/browser/chrome/browser/preferences/tabs.dtd
+++ b/browser/chrome/browser/preferences/tabs.dtd
@@ -8,8 +8,10 @@
 <!ENTITY warnOpenManyTabs.accesskey       "U">
 
 <!ENTITY showTabBar.label             "Vždy zobraziť panel kariet">
 <!ENTITY showTabBar.accesskey         "V">
 
 <!ENTITY switchToNewTabs.label        "Pri otvorení odkazu na novej karte ju preniesť do popredia">
 <!ENTITY switchToNewTabs.accesskey    "r">
 
+<!ENTITY showTabsInTaskbar.label          "Zobrazovať ukážky kariet v paneli úloh systému Windows">
+<!ENTITY showTabsInTaskbar.accesskey      "o">
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/syncBrand.dtd
@@ -0,0 +1,2 @@
+<!ENTITY syncBrand.shortName.label  "Sync">
+<!ENTITY syncBrand.fullName.label   "Firefox Sync">
\ No newline at end of file
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/syncCommon.dtd
@@ -0,0 +1,27 @@
+<!--
+# syncCommon.dtd contains items that are common to multiple XUL files used by
+# sync. Namely, the pref pane and the setup dialog -->
+
+<!ENTITY syncComputerName.label       "Názov počítača:">
+<!ENTITY syncComputerName.accesskey   "a">
+
+<!ENTITY syncModeSwitchDesc.label     "&brandShortName; bude: ">
+<!ENTITY syncModeSwitchDesc.accesskey "b">
+
+<!ENTITY syncEverything.label         "synchronizovať všetko">
+<!ENTITY customSync.label             "používať moje vlastné nastavenia">
+
+<!ENTITY syncEverythingDescription.label  "Synchronizovať sa budú vaše záložky, história, heslá, nastavenia a otvorené karty.">
+
+<!ENTITY syncItem.bookmarks.label     "Synchronizovať záložky">
+<!ENTITY syncItem.bookmarks.accesskey "z">
+<!ENTITY syncItem.tabs.label          "Synchronizovať karty">
+<!ENTITY syncItem.tabs.accesskey      "k">
+<!ENTITY syncItem.history.label       "Synchronizovať históriu">
+<!ENTITY syncItem.history.accesskey   "h">
+<!ENTITY syncItem.passwords.label     "Synchronizovať heslá">
+<!ENTITY syncItem.passwords.accesskey "e">
+<!ENTITY syncItem.prefs.label         "Synchronizovať nastavenia">
+<!ENTITY syncItem.prefs.accesskey     "c">
+
+<!ENTITY changePassphrase.label       "Zmeniť tajnú frázu">
\ No newline at end of file
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/syncGenericChange.properties
@@ -0,0 +1,40 @@
+# LOCALIZATION NOTE (change.password.title): This (and associated change.password/passphrase) are used when the user elects to change their password.
+change.password.title = Zmena hesla
+change.password.acceptButton = Zmeniť heslo
+change.password.status.active = Prebieha zmena vášho hesla…
+change.password.status.success = Vaše heslo bolo zmenené.
+change.password.status.error = Pri pokuse o zmenu vášho hesla sa vyskytla chyba.
+
+change.password.introText = Vaše heslo musí mať minimálne 8 znakov. Nesmie byť rovnaké ako vaše používateľské meno alebo tajná fráza.
+change.password.warningText = Poznámka: keď zmeníte toto heslo, žiadne z vašich ostatných zariadaní sa nebude môcť pripojiť k tomuto účtu.
+
+change.passphrase.title = Zmena tajnej frázy
+change.passphrase.acceptButton = Zmeniť tajnú frázu
+change.passphrase.label = Mení sa tajná fráza a odosielajú sa lokálne údaje. Prosím, čakajte…
+change.passphrase.error = Počas zmeny tajnej frázy sa vyskytla chyba!
+change.passphrase.success = Vaša tajná fráza bola úspešne zmenená!
+
+new.passphrase.label = Nová tajná fráza
+new.passphrase.confirm = Potvrdenie tajnej frázy
+
+# LOCALIZATION NOTE (change.passphrase.introText) "Sync" should match &syncBrand.shortName.label; from syncBrand.dtd
+change.passphrase.introText = Vaša tajná fráza musí mať minimálne 12 znakov. Služba Sync použije túto frázu pri šifrovaní vašich údajov.
+# LOCALIZATION NOTE (change.passphrase.introText2) "Firefox Sync" should match syncBrand.fullName.label from syncBrand.dtd
+change.passphrase.introText2 = Frázu si môžete zapísať, pretože táto sa nikdy neposiela cez internet a z bezpečnostných dôvodov ju Firefox Sync nikde nezálohuje.
+# LOCALIZATION NOTE (change.passphrase.warningText) "Sync" should match &syncBrand.shortName.label; from syncBrand.dtd
+change.passphrase.warningText = Poznámka: týmto sa vymažú všetky údaje uložené na serveri služby Sync. Následne sa na server odošlú údaje zašifrované novou frázou. Vaše ďalšie zariadenia nebudú sychronizované do doby, kým na danom zariadení nezadáte novú frázu.
+
+# LOCALIZATION NOTE (new.password.title): This (and associated new.password/passphrase) are used on a second computer when it detects that your password or passphrase has been changed on a different device.
+new.password.title            = Aktualizácia hesla
+new.password.introText        = Vaše heslo bolo odmietnuté serverom, aktualizujte ho.
+new.password.label            = Zadajte vaše nové heslo
+new.password.confirm          = Potvrďte vaše nové heslo
+new.password.acceptButton     = Aktualizovať heslo
+new.password.status.incorrect = Heslo nie je správne, skúste to znova.
+
+new.passphrase.title            = Aktualizácia tajnej frázy
+new.passphrase.introText        = Vaša tajná fráza bola zmenená, zadajte novú frázu.
+new.passphrase.label            = Nová tajná fráza
+new.passphrase.confirm          = Potvrďte tajnú frázu
+new.passphrase.acceptButton     = Aktualizovať tajnú frázu
+new.passphrase.status.incorrect = Tajná fráza nie je správna, skúste to znova.
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/syncSetup.properties
@@ -0,0 +1,13 @@
+cancelSetup.label           = Zrušiť sprievodcu
+errorCreatingAccount.title  = Chyba pri vytváraní účtu
+
+invalidEmail.label          = Neplatná e-mailová adresa
+serverInvalid.label         = Zadajte platnú adresu URL servera
+usernameNotAvailable.label  = Meno sa už používa
+
+additionalClients.label     = a ďalšie zariadenia (celkom %S)
+bookmarkCount.label         = Záložky: %S
+historyCount.label          = Dni histórie: %S
+passwordCount.label         = Heslá: %S
+
+# Several other strings are used (via Weave.Status.login), but they come from /services/sync
\ No newline at end of file
--- a/browser/feedback/main.dtd
+++ b/browser/feedback/main.dtd
@@ -8,17 +8,17 @@
 <!ENTITY testpilot.settings.alwaysSubmitData.label  "Automaticky odosielať moje údaje (nepýtať sa)">
 <!ENTITY testpilot.allStudies.label                 "Všetky vaše používateľské štúdie">
 <!ENTITY testpilot.about.label                      "O rozšírení Test Pilot">
 
 <!-- all studies window -->
 <!ENTITY testpilot.studiesWindow.title                  "Vaše štúdie rozšírenia Test Pilot">
 <!ENTITY testpilot.studiesWindow.currentStudies.label   "Aktuálne štúdie">
 <!ENTITY testpilot.studiesWindow.finishedStudies.label  "Dokončené štúdie">
-<!ENTITY testpilot.studiesWindow.studyFindings.label    "Zistenia štúdie">
+<!ENTITY testpilot.studiesWindow.studyFindings.label    "Zistenia štúdií">
 <!ENTITY testpilot.studiesWindow.settings.label         "Nastavenia">
 <!ENTITY testpilot.studiesWindow.stillLoadingMessage    "Načítava sa… Prosím, čakajte.">
 
 <!-- raw data dialog -->
 <!ENTITY testpilot.rawDataWindow.title                  "Test Pilot: nespracované údaje">
 
 <!-- notification -->
 <!ENTITY testpilot.notification.close.tooltip            "Zavrieť">
--- a/browser/feedback/main.properties
+++ b/browser/feedback/main.properties
@@ -9,16 +9,17 @@ testpilot.turnOn = Zapnúť používateľské štúdie
 testpilot.turnOff = Vypnúť používateľské štúdie
 
 # studies window
 testpilot.studiesWindow.noStudies = Práve pracujeme na novej štúdii, ktorej sa onedlho budete môcť zúčastniť. Sledujte nás!
 testpilot.studiesWindow.uploading = Odosiela sa…
 testpilot.studiesWindow.unableToReachServer = Pripojenie k serverom Mozilla neúspešné. Prosím, skúste to neskôr.
 testpilot.studiesWindow.thanksForContributing = Ďakujeme za príspevok!
 testpilot.studiesWindow.finishedOn = Dokončená: %S
+testpilot.studiesWindow.missedStudy = (Túto štúdiu ste zmeškali)
 testpilot.studiesWindow.canceledStudy = (Túto štúdiu ste zrušili)
 testpilot.studiesWindow.willStart = Spustenie: %S
 testpilot.studiesWindow.gatheringData = Získavajú sa údaje.
 testpilot.studiesWindow.willFinish = Ukončenie: %S
 testpilot.studiesWindow.proposeStudy = Navrhnúť vlastnú štúdiu
 
 # for pages
 testpilot.page.commentsAndDiscussions = Komentáre a diskusie »
@@ -78,17 +79,17 @@ testpilot.finishedTask.allRelatedDataDeleted = Všetky údaje vzťahujúce sa k tejto štúdií boli z vášho počítača odstránené.
 
 # modules/setup.js
 testpilot.notification.update = Aktualizovať…
 testpilot.notification.thankYouForUploadingData = Ďakujeme!
 testpilot.notification.thankYouForUploadingData.message = Ďakujeme za odosielanie údajov.
 testpilot.notification.readyToSubmit = Pripravené na odoslanie
 testpilot.notification.readyToSubmit.message = Rozšírenie Test Pilot dokončilo získanie údajov pre štúdiu "%S" a je pripravené na ich odoslanie.
 testpilot.notification.newTestPilotStudy = Nová štúdia rozšírenia Test Pilot
-testpilot.notification.newTestPilotStudy.message = Práve začína štúdia "%S" doplnku Test Pilot.
+testpilot.notification.newTestPilotStudy.pre.message = Čoskoro začne štúdia "%S" doplnku Test Pilot.
 testpilot.notification.newTestPilotSurvey = Nový prieskum rozšírenia Test Pilot
 testpilot.notification.newTestPilotSurvey.message = Je dostupný prieskum "%S" rozšírenia Test Pilot.
 testpilot.notification.newTestPilotResults = Nové výsledky štúdií rozšírenia Test Pilot
 testpilot.notification.newTestPilotResults.message = Pre štúdiu "%S" rozšírenia Test Pilot sú dostupné nové výsledky.
 testpilot.notification.autoUploadedData = Ďakujeme!
 testpilot.notification.autoUploadedData.message = Štúdia "%S" rozšírenia Test Pilot je dokončená a vaše údaje boli úspešne odoslané!
 testpilot.notification.extensionUpdate = Aktualizácia rozšírenia
 testpilot.notification.extensionUpdate.message = Jedna zo štúdií vyžaduje novšiu verziu rozšírenia Test Pilot, ktorú môžete získať v okne Správcu doplnkov.
--- a/mail/chrome/messenger/messengercompose/composeMsgs.properties
+++ b/mail/chrome/messenger/messengercompose/composeMsgs.properties
@@ -358,8 +358,12 @@ attachmentReminderFalseAlarm=Nezabudol, odoslať správu
 ## LOCALIZATION NOTE(smtpEnterPasswordPrompt): Do not translate the
 ## word %S. Place the word %S where the host name should appear.
 smtpEnterPasswordPrompt=Zadajte heslo pre %S:
 ## LOCALIZATION NOTE(smtpEnterPasswordPromptWithUsername): Do not translate the
 ## words %1$S and %2$S. Place the word %1$S where the host name should appear,
 ## and %2$S where the user name should appear.
 smtpEnterPasswordPromptWithUsername=Zadajte heslo pre %2$S na %1$S:
 smtpEnterPasswordPromptTitle=Vyžadované heslo k serveru SMTP
+
+# LOCALIZATION NOTE (removeAttachmentMsgs): Semi-colon list of plural forms.
+# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
+removeAttachmentMsgs=Odstrániť prílohu;Odstrániť prílohy;Odstrániť prílohy
--- a/mail/chrome/messenger/msgHdrViewOverlay.dtd
+++ b/mail/chrome/messenger/msgHdrViewOverlay.dtd
@@ -100,16 +100,18 @@
 <!ENTITY otherActionsPrint.accesskey "t">
 
 <!ENTITY openAttachmentCmd.label "Otvoriť">
 <!ENTITY openAttachmentCmd.accesskey "O">
 <!ENTITY saveAsAttachmentCmd.label "Uložiť ako…">
 <!ENTITY saveAsAttachmentCmd.accesskey "a">
 <!ENTITY detachAttachmentCmd.label "Vyčleniť…">
 <!ENTITY deleteAttachmentCmd.label "Odstrániť">
+<!ENTITY openAllAttachmentsCmd.label    "Otvoriť všetky…">
+<!ENTITY openAllAttachmentsCmd.accesskey    "O">
 <!ENTITY saveAllAttachmentsCmd.label "Uložiť všetky prílohy">
 <!ENTITY saveAllAttachmentsCmd.accesskey "U">
 <!ENTITY detachAllAttachmentsCmd.label "Vyčleniť všetky prílohy…">
 <!ENTITY detachAllAttachmentsCmd.accesskey "V">
 <!ENTITY deleteAllAttachmentsCmd.label "Odstrániť všetky prílohy…">
 <!ENTITY deleteAllAttachmentsCmd.accesskey "d">
 
 <!ENTITY copyLinkCmd.label "Kopírovať adresu odkazu">
--- a/mobile/chrome/browser.dtd
+++ b/mobile/chrome/browser.dtd
@@ -16,25 +16,21 @@
 <!ENTITY copylink.label        "Kopírovať adresu odkazu">
 <!ENTITY paste.label           "Prilepiť">
 <!ENTITY delete.label          "Odstrániť">
 <!ENTITY selectAll.label       "Vybrať všetko">
 <!ENTITY noSuggestions.label   "(Žiadne návrhy)">
 <!ENTITY addToDictionary.label "Pridať do slovníka">
 
 <!ENTITY bookmarksHeader.label     "Záložky">
-<!ENTITY bookmarksManage.label     "Spravovať">
 
-<!ENTITY editBookmarkRemove.label  "Odstrániť">
 <!ENTITY editBookmarkDone.label    "Hotovo">
 <!ENTITY editBookmarkTags.label    "Pridajte značky">
 
-<!ENTITY formHelper.previous       "Predchádzajúca">
-<!ENTITY formHelper.next           "Ďalšia">
-<!ENTITY formHelper.done           "Hotovo">
+<!ENTITY selectHelper.done         "Hotovo">
 
 <!ENTITY addonsHeader.label        "Doplnky">
 <!ENTITY addonsLocal.label         "Vaše doplnky">
 <!ENTITY addonsUpdate.label        "Aktualizovať">
 <!ENTITY addonsRepo.label          "Získať doplnky">
 <!ENTITY addonsRecommended.label   "Odporúčané">
 <!ENTITY addonsSearch.label        "Hľadať">
 <!ENTITY addonsSearch2.emptytext   "Prehľadávať katalóg">
@@ -83,10 +79,14 @@
 <!ENTITY consoleMessages.label     "Správy">
 <!ENTITY consoleCodeEval.label     "Kód:">
 <!ENTITY consoleClear.label        "Vymazať">
 <!ENTITY consoleEvaluate.label     "…">
 <!ENTITY consoleErrFile.label      "Zdroj:">
 <!ENTITY consoleErrLine.label      "Riadok:">
 <!ENTITY consoleErrColumn.label    "Stĺpec:">
 
-<!ENTITY contextOpenInNewTab.label "Otvoriť odkaz na novej karte">
-<!ENTITY contextSaveImage.label    "Uložiť obrázok">
+<!ENTITY contextOpenInNewTab.label    "Otvoriť odkaz na novej karte">
+<!ENTITY contextSaveImage.label       "Uložiť obrázok">
+<!ENTITY contextShareLink.label       "Zdieľať odkaz">
+<!ENTITY contextShareImage.label      "Zdieľať obrázok">
+<!ENTITY contextEditBookmark.label    "Upraviť">
+<!ENTITY contextRemoveBookmark.label  "Odstrániť">
--- a/mobile/chrome/browser.properties
+++ b/mobile/chrome/browser.properties
@@ -138,21 +138,23 @@ tabs.closeWarningPromptMe=Upozorniť vždy, ak sa pokúšam zavrieť viac kariet naraz
 # 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
 pageactions.search.addNew=Pridať vyhľadávací modul
+pageactions.share.page=Zdieľať stránku
 pageactions.password.forget=Zabudnúť heslo
 pageactions.reset=Vymazať nastavenia stránky
 pageactions.geo=Umiestnenie
 pageactions.popup=Vyskakovacie okná
 pageactions.offline-app=Ukladací priestor režimu offline
 pageactions.password=Heslo
+pageactions.findInPage=Hľadať na stránke
 
 # Helper App Dialog (Save/Open)
 helperApp.title=Otvorenie súboru
 helperApp.prompt=Čo si prajete vykonať s:
 helperApp.open=Otvoriť
 helperApp.save=Uložiť
 helperApp.nothing=Nič
--- a/mobile/profile/bookmarks.inc
+++ b/mobile/profile/bookmarks.inc
@@ -14,20 +14,16 @@
 # LOCALIZATION NOTE (bookmarks_welcome):
 # link title for about:firstrun
 #define bookmarks_welcome Firefox: Vitajte
 
 # LOCALIZATION NOTE (bookmarks_aboutBrowser):
 # link title for about:fennec
 #define bookmarks_aboutBrowser Firefox: O vašom prehliadači
 
-# LOCALIZATION NOTE (bookmarks_weave):
-# link title for https://www.mozilla.com/en-US/mobile/sync
-#define bookmarks_sync Firefox: Synchronizácia pomocou Weave Sync
-
 # LOCALIZATION NOTE (bookmarks_addons):
 # link title for https://addons.mozilla.org/en-US/mobile
 #define bookmarks_addons Firefox: Prispôsobenie pomocou doplnkov
 
 # LOCALIZATION NOTE (bookmarks_support):
 # link title for https://mobile.support.mozilla.com
 #define bookmarks_support Firefox: Podpora
 
--- a/security/manager/chrome/pippki/pippki.properties
+++ b/security/manager/chrome/pippki/pippki.properties
@@ -100,20 +100,24 @@ clientAuthMessage2=Vydané pod: "%S"
 pageInfo_SiteNotVerified=Identita servera nie je overená
 pageInfo_WebSiteVerified=Identita servera je overená
 pageInfo_Identity_Verified=Server %S podporuje autentifikáciu stránky, ktorú práve čítate. Identita servera bola overená certifikačnou autoritou %S, ktorej dôverujete pri overovaní serverov.
 pageInfo_ViewCertificate=Zobraziť bezpečnostný certifikát, ktorý overil identitu tejto stránky.
 pageInfo_NoEncryption=Pripojenie nie je šifrované
 pageInfo_Privacy_None1=Server %S nepodporuje šifrovanie pre stránku, ktorú práve čítate.
 pageInfo_Privacy_None2=Informácie odoslané cez internet bez zašifrovania môžu byť počas cesty pozorované inými ľuďmi.
 pageInfo_Privacy_None3=Stránka, ktorú čítate, nie je zašifrovaná.
-pageInfo_StrongEncryptionWithBits=Pripojenie je šifrované: Vysoký stupeň zašifrovania (%S, %S bitové kľúče)
+# LOCALIZATION NOTE (pageInfo_StrongEncryptionWithBits): %1$S is the name of the encryption standard,
+# %2$S is the key size of the cipher.
+pageInfo_StrongEncryptionWithBits=Pripojenie je šifrované: Vysoký stupeň zašifrovania (%1$S, %2$S bitové kľúče)
 pageInfo_Privacy_Strong1=Stránka, ktorú čítate, bola zašifrovaná predtým, ako bola odoslaná cez internet.
 pageInfo_Privacy_Strong2=Vďaka zašifrovaniu je pre neautorizovaných ľudí veľmi ťažké vidieť informácie, putujúce medzi dvoma počítačmi. Je preto veľmi nepravdepodobné, že by niekto prečítal túto stránku počas jej cesty po internete.
-pageInfo_WeakEncryptionWithBits=Pripojenie je šifrované: Nízky stupeň zašifrovania (%S, %S bitové kľúče)
+# LOCALIZATION NOTE (pageInfo_WeakEncryptionWithBits): %1$S is the name of the encryption standard,
+# %2$S is the key size of the cipher.
+pageInfo_WeakEncryptionWithBits=Pripojenie je šifrované: Nízky stupeň zašifrovania (%1$S, %2$S bitové kľúče)
 pageInfo_Privacy_Weak1=Server %S používa pre stránku, ktorú práve čítate, nízky stupeň zašifrovania.
 pageInfo_Privacy_Weak2=Nízky stupeň zašifrovania môže umožniť niektorým neautorizovaným osobám prečítať túto informáciu.
 pageInfo_MixedContent=Pripojenie je čiastočne šifrované
 pageInfo_Privacy_Mixed1=Časť stránky, ktorú čítate, nebola zašifrovaná predtým, ako bola odoslaná cez internet.
 
 #Cert Viewer
 certDetails=Zobrazenie certifikátu:
 notPresent=<nie je súčasťou certifikátu>
new file mode 100644
--- /dev/null
+++ b/services/sync/errors.properties
@@ -0,0 +1,26 @@
+error.login.reason.network    = Nepodarilo sa pripojiť k serveru
+error.login.reason.passphrase = Nesprávna tajná fráza
+error.login.reason.password   = Nesprávne používateľské meno alebo heslo
+error.login.reason.no_password= Žiadne uložené heslo vhodné na použitie
+error.login.reason.no_passphrase= Žiadna tajná fráza vhodná na použitie
+error.login.reason.server     = Server nie je správne nakonfigurovaný
+
+error.sync.failed_partial     = Jeden alebo viac typov údajov nemohlo byť synchronizovaných
+
+invalid-captcha = Nesprávne slová, skúste to znova
+weak-password   = Použite silnejšie heslo
+
+# this is the fallback, if we hit an error we didn't bother to localize
+error.reason.unknown          = Neznáma chyba
+
+change.passphrase.ppSameAsPassphrase = Tajná fráza sa nesmie zhodovať s vašou aktuálnou tajnou frázou
+change.passphrase.ppSameAsPassword   = Tajná fráza sa nesmie zhodovať s vašim heslom
+change.passphrase.ppSameAsUsername   = Tajná fráza sa nesmie zhodovať s vašim používateľským menom
+change.passphrase.mismatch           = Zadané tajné frázy sa nezhodujú
+change.passphrase.tooShort           = Zadaná tajná fráza je príliš krátka
+
+change.password.pwSameAsPassphrase   = Vaše heslo sa nesmie zhodovať s vašou tajnou frázou
+change.password.pwSameAsPassword     = Vaše heslo sa nesmie zhodovať s vašim aktuálnym heslom
+change.password.pwSameAsUsername     = Vaše heslo sa nesmie zhodovať s vašim používateľským menom
+change.password.mismatch             = Zadané heslá sa nezhodujú
+change.password.tooShort             = Zadané heslo je príliš krátke
new file mode 100644
--- /dev/null
+++ b/services/sync/sync.properties
@@ -0,0 +1,37 @@
+# %1: the user name (Ed), %2: the app name (Firefox), %3: the operating system (Android)
+client.name2 = %2$S používateľa %1$S (systém %3$S)
+
+# %S is the date and time at which the last sync successfully completed
+lastSync.label = Naposledy aktualizované: %S
+lastSyncInProgress.label = Naposledy aktualizované: práve aktualizuje sa…
+
+# %S is the username logged in
+connected.label = Pripojený: %S
+disconnected.label = Odpojený
+connecting.label = Pripája sa…
+
+mobile.label = Záložky mobilného Firefoxu
+
+remote.pending.label = Synchronizujú sa vzdialené karty…
+remote.missing.label = Synchronizujte si vaše ostatné počítače, aby ste sa mohli dostať k ich kartám
+remote.opened.label = Všetky vzdialené karty sú už otvorené
+remote.notification.label = Najnovšie karty otvorené na počítači budú dostupné po synchronizácii
+
+error.login.title = Chyba pri prihlasovaní
+error.login.description = Počas pripájania Sync sa vyskytla chyba: %1$S. Skúste to znova.
+error.login.prefs.label = Nastavenia…
+error.login.prefs.accesskey = N
+# should decide if we're going to show this
+error.logout.title = Chyba pri odhlasovaní
+error.logout.description = Počas odpájania Sync sa vyskytla chyba. Pravdepodobne je to v poriadku a nemusíte sa s tým viac zaoberať.
+error.sync.title = Chyba počas synchronizácie
+error.sync.description = Počas synchronizácie Sync sa vyskytla chyba: %1$S. Firefox Sync automaticky zopakuje túto akciu.
+error.sync.no_node_found = Server Sync je práve teraz trochu zaneprázdnený, ale nemusíte sa tým zaoberať. Údaje budú synchronizovať akonáhle to bude možné!
+error.sync.no_node_found.title = Odloženie synchronizácie
+error.sync.needUpdate.description = Ak chcete naďalej synchronizovať vaše údaje, musíte aktualizovať Firefox Sync.
+error.sync.needUpdate.label = Aktualizovať Firefox Sync
+error.sync.needUpdate.accesskey = A
+error.sync.tryAgainButton.label = Synchronizovať
+error.sync.tryAgainButton.accesskey = S
+
+tabs.fromOtherComputers.label = Karty z ďalších počítačov
--- a/suite/chrome/browser/navigator.properties
+++ b/suite/chrome/browser/navigator.properties
@@ -36,14 +36,26 @@ tabs.recentlyClosed.format=%1$S %2$S
 windows.recentlyClosed.format=%1$S %2$S
 
 tabs.closeWarningTitle=Potvrdenie zatvorenia
 tabs.closeWarning=V tomto okne prehliadača je otvorených niekoľko kariet (celkom %S). Chcete ho zavrieť spolu so všetkými kartami?
 tabs.closeButton=Zavrieť všetky karty
 tabs.closeWarningPromptMe=Upozorniť vždy, keď sa pokúšam zavrieť viac kariet naraz
 tabs.historyItem=Skupina kariet
 
+# LOCALIZATION NOTE (lwthemeInstallRequest.message): %S will be replaced with
+# the host name of the site.
+lwthemeInstallRequest.message=Táto stránka (%S) sa pokúša nainštalovať tému.
+lwthemeInstallRequest.allowButton=Povoliť
+lwthemeInstallRequest.allowButton.accesskey=v
+
+lwthemePostInstallNotification.message=Bola nainštalovaná nová téma.
+lwthemePostInstallNotification.undoButton=Vrátiť späť
+lwthemePostInstallNotification.undoButton.accesskey=V
+lwthemePostInstallNotification.manageButton=Správa tém…
+lwthemePostInstallNotification.manageButton.accesskey=m
+
 # urlbarBindings.xml
 # LOCALIZATION NOTE: This is for the location bar drop-down string:
 #   "Search " + search_engine_name + " for " + user_input
 #   e.g. "Search Google for abc"
 # DO NOT change the %S order when translate, the first %S must be the search engine name.
 searchFor=Vyhľadať pomocou %S text "%S"
--- a/suite/chrome/browser/pageInfo.dtd
+++ b/suite/chrome/browser/pageInfo.dtd
@@ -33,17 +33,17 @@
 # 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 *****
 -->
 
 <!-- Note to localizers, don't localize the strings 'width' or 'height' -->
-<!ENTITY  pageInfoWindow.dimensions  "width: 100ch; height: 30em;">
+<!ENTITY  pageInfoWindow.dimensions  "width: 100ch; height: 38em;">
 
 <!ENTITY  copy.key              "C">
 <!ENTITY  copy.label            "Kopírovať">
 <!ENTITY  copy.accesskey        "K">
 <!ENTITY  selectall.key         "A">
 <!ENTITY  selectall.label       "Vybrať všetko">
 <!ENTITY  selectall.accesskey   "a">
 <!ENTITY  openHelpMac.key       "?">
--- a/suite/chrome/common/help/cs_nav_prefs_advanced.xhtml
+++ b/suite/chrome/common/help/cs_nav_prefs_advanced.xhtml
@@ -285,18 +285,18 @@
 
 <h3 id="advanced_proxy_preferences">Advanced Proxy Preferences</h3>
 
 <p>If you want to use different proxies for different protocols or need to use
   a SOCKS proxy:</p>
 
 <ul>
   <li><strong>HTTP Proxy</strong>, <strong>SSL Proxy</strong>,
-    <strong>FTP Proxy</strong>, <strong>Gopher Proxy</strong>: Enter the name
-    or numeric IP address of the proxy server. Type the port in the Port fields.
+    <strong>FTP Proxy</strong>: Enter the name or numeric IP address 
+    of the proxy server. Type the port in the Port fields.
 
     <p><strong>Note</strong>: If you&apos;re using the same settings
       for all types of proxies, click on <q>Use HTTP Proxy settings
       for all protocols</q>.</p>
 
   </li>
   <li><strong>SOCKS Proxy</strong>: Enter the name or numeric IP address
     of the proxy server. Enter the port number in the Port field. 
--- a/suite/chrome/common/help/glossary.xhtml
+++ b/suite/chrome/common/help/glossary.xhtml
@@ -105,19 +105,16 @@
   <dd>Dva páry verejno-súkromných kľúčov, t.j. 4 kľúče dokopy, korešpondujúce s dvomi rozdielnymi certifikátmi. Súkromný kľúč z jedného páru sa používa pri podpisových operáciách a verejný a súkromný kľúč z druhého páru sa používajú na zašifrovanie a dešifrovanie. Každý pár korešponduje s iným <a href="#certificate">certifikátom</a>. Pozrite tiež <a href="#public-key_cryptography">Šifrovanie verejným kľúčom</a>.</dd>
 
 <dt id="fips_pubs_140-1">FIPS PUBS 140-1</dt>
   <dd>Federal Information Processing Standards Publications (FIPS PUBS) 140-1 je norma vlády USA na implementáciu šifrovacích modulov — hardvéru alebo softvéru, ktoré zašifrujú a dešifrujú údaje alebo vykonajú iné šifrovacie operácie (napríklad vytváranie alebo overovanie digitálnych podpisov). Veľmi veľa produktov dodávaných vláde USA musí spĺňať jednu či viac FIPS noriem.</dd>
 
 <dt id="ftp">FTP (File Transfer Protocol)</dt>
   <dd>Norma, ktorá umožňuje používateľom prenos súborov z jedného počítača do iného prostredníctvom siete. Na prenos súborov pomocou protokolu FTP je možné použiť aj &brandShortName;.</dd>
 
-<dt id="gopher">Gopher</dt>
-  <dd>Protokol používaný na vyhľadávanie a opätovné získanie informácií z internetových <a href="#server">serverov</a> pred nástupom <a href="#world_wide_web">World Wide Webu</a>.</dd>
-
 <dt id="certificate_backup_password">Heslo zálohovaného certifikátu</dt>
   <dd>Heslo, ktoré chráni certifikát, ktorý zálohujete alebo ste zálohovali. Správca certifikátov vás požiada, aby ste toto heslo nastavili, keď zálohujete certifikát a vypýta si ho, ak sa pokúsite obnoviť dané dáta.</dd>
 
 <dt id="master_password">Hlavné heslo</dt>
   <dd>Heslo používané Správcom certifikátov na ochranu hlavného kľúča a/alebo súkromných kľúčov uložených na <a href="#security_device">bezpečnostnom zariadení</a>. Správca certifikátov potrebuje prístup k vašim súkromným kľúčom vtedy, keď napríklad podpisujete správu alebo používate jeden zo svojich vlastných certifikátov. Prístup k hlavnému heslu je potrebný, keď Správca hesiel alebo Správca formulárov čítajú či pridávajú vaše osobné údaje. Môžete nastaviť alebo zmeniť hlavné heslo v paneli nastavení Hlavného hesla. Každé bezpečnostné zariadenie požaduje odlišné hlavné heslo. Ďalšie informácie nájdete v sekciách <a href="#private_key"> Súkromný kľúč</a>, <a href="#master_key">Hlavný kľúč</a>.</dd>
 
 <dt id="master_key">Hlavný kľúč</dt>
   <dd>Symetrický kľúč používaný <a href="#certificate_manager">Správcom certifikátov</a> na zašifrovanie informácií. Napríklad, <a href="#password_manager">Správca hesiel</a> použije Správcu certifikátov a hlavný kľúč na zašifrovanie hesiel e-mailových účtov, hesiel webových stránok a iných citlivých informácií. Ďalšie informácie nájdete pod pojmom <a href="#symmetric_encryption">symetrické šifrovanie</a>.</dd>
--- a/suite/chrome/common/help/help-glossary.rdf
+++ b/suite/chrome/common/help/help-glossary.rdf
@@ -33,17 +33,16 @@
         <rdf:li> <rdf:Description nc:name="Digitálne ID" nc:link="glossary.xhtml#digital_id"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="Digitálny podpis" nc:link="glossary.xhtml#digital_signature"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="Domovská stránka" nc:link="glossary.xhtml#home_page"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="Doplnok" nc:link="glossary.xhtml#add-on"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="Dôvera" nc:link="glossary.xhtml#trust"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="Dvojité páry kľúčov" nc:link="glossary.xhtml#dual_key_pairs"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="FIPS PUBS 140-1" nc:link="glossary.xhtml#fips_pubs_140-1"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="FTP" nc:link="glossary.xhtml#ftp"/> </rdf:li>
-        <rdf:li> <rdf:Description nc:name="Gopher" nc:link="glossary.xhtml#gopher"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="Heslo zálohovaného certifikátu password" nc:link="glossary.xhtml#certificate_backup_password"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="Hlavné heslo" nc:link="glossary.xhtml#master_password"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="Hlavný kľúč" nc:link="glossary.xhtml#master_key"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="HTML" nc:link="glossary.xhtml#html"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="HTTP" nc:link="glossary.xhtml#http"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="HTTPS" nc:link="glossary.xhtml#https"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="Chybný výklad" nc:link="glossary.xhtml#misrepresentation"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="IMAP" nc:link="glossary.xhtml#imap"/> </rdf:li>
--- a/suite/chrome/common/help/help-index1.rdf
+++ b/suite/chrome/common/help/help-index1.rdf
@@ -821,17 +821,17 @@
    <nc:subheadings>
      <rdf:Seq><rdf:li>
        <rdf:Description ID="images"
          nc:name="obrázky"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="IMAP"
          nc:name="IMAP"
-         nc:link="mail_help.xhtml#about_internet_message_access_protocol"/>
+         nc:link="mailnews_account_settings.xhtml#about_internet_message_access_protocol"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="import"
          nc:name="import"/>
      </rdf:li></rdf:Seq>
    </nc:subheadings>
 </rdf:Description>
 
@@ -861,27 +861,27 @@
    </nc:subheadings>
 </rdf:Description>
 
 <rdf:Description about="#IMAP">
    <nc:subheadings>
      <rdf:Seq><rdf:li>
        <rdf:Description ID="IMAP:about"
          nc:name="čo je IMAP"
-         nc:link="mail_help.xhtml#about_internet_message_access_protocol"/>
+         nc:link="mailnews_account_settings.xhtml#about_internet_message_access_protocol"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="IMAP:advanced_mail_settings"
          nc:name="rozšírené nastavenia IMAP"
-         nc:link="mail_help.xhtml#advanced_imap_server_settings"/>
+         nc:link="mailnews_account_settings.xhtml#advanced_imap_server_settings"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="IMAP:server_settings"
          nc:name="nastavenia servera IMAP"
-         nc:link="mail_help.xhtml#imap_server_settings"/>
+         nc:link="mailnews_account_settings.xhtml#imap_server_settings"/>
      </rdf:li></rdf:Seq>
    </nc:subheadings>
 </rdf:Description>
 
 <rdf:Description about="#import">
    <nc:subheadings>
      <rdf:Seq><rdf:li>
        <rdf:Description ID="import:address_book"
@@ -1045,27 +1045,27 @@
      <rdf:li>
        <rdf:Description ID="LDAP:directory_server_settings"
          nc:name="nastavenie priečinkov servera"
          nc:link="mail_help.xhtml#directory_server_settings"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="LDAP:global_settings"
          nc:name="nastavenie LDAP"
-         nc:link="mail_help.xhtml#addressing_preferences"/>
+         nc:link="mailnews_preferences.xhtml#addressing_preferences"/>
      </rdf:li></rdf:Seq>
    </nc:subheadings>
 </rdf:Description>
 
 <rdf:Description about="help-indexAZ.rdf#m">
    <nc:subheadings>
      <rdf:Seq><rdf:li>
        <rdf:Description ID="mail"
          nc:name="nastavenia bezpečnosti pošty"
-         nc:link="mail_help.xhtml#security"/>
+         nc:link="mailnews_account_settings.xhtml#security"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="Mail_and_Newsgroups"
          nc:name="Pošta a diskusné skupiny"
          nc:link="mail_help.xhtml"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="master_password"
@@ -1090,62 +1090,62 @@
      <rdf:li>
        <rdf:Description ID="Mail_and_Newsgroups:adding_accounts"
          nc:name="pridanie účtov"
          nc:link="mail_help.xhtml#setting_up_additional_mail_and_news_accounts"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="Mail_and_Newsgroups:address_autocompletion"
          nc:name="automatické dokončovanie adries"
-         nc:link="mail_help.xhtml#address_autocompletion"/>
+         nc:link="mailnews_preferences.xhtml#address_autocompletion"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="Mail_and_Newsgroups:addressing_messages"
          nc:name="adresovanie správ"
          nc:link="mail_help.xhtml#addressing_a_message"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="Mail_and_Newsgroups:addressing_preferences"
          nc:name="nastavenia adresovania"
-         nc:link="mail_help.xhtml#addressing_preferences"/>
+         nc:link="mailnews_preferences.xhtml#addressing_preferences"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="Mail_and_Newsgroups:Advanced_IMAP_settings"
          nc:name="Rozšírené nastavenia IMAP"
-         nc:link="mail_help.xhtml#advanced_imap_server_settings"/>
+         nc:link="mailnews_account_settings.xhtml#advanced_imap_server_settings"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="Mail_and_Newsgroups:attaching_files"
          nc:name="pripojenie súborov"
          nc:link="mail_help.xhtml#attaching_a_file_or_web_page"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="Mail_and_Newsgroups:changing_account_settings"
          nc:name="zmena nastavení účtu"
          nc:link="mail_help.xhtml#changing_the_settings_for_an_account"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="Mail_and_Newsgroups:Character_Encoding"
          nc:name="Kódovanie"
-         nc:link="mail_help.xhtml#character_encoding"/>
+         nc:link="mailnews_preferences.xhtml#character_encoding"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="Mail_and_Newsgroups:Compose_window"
          nc:name="Okno písania správy"
          nc:link="mail_help.xhtml#using_the_message_composition_window"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="Mail_and_Newsgroups:composing_messages"
          nc:name="písanie správ"
          nc:link="mail_help.xhtml#composing_mail_and_newsgroup_messages"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="Mail_and_Newsgroups:copies_and_folder_settings"
          nc:name="kópie a nastavenia priečinkov"
-         nc:link="mail_help.xhtml#copies_and_folders"/>
+         nc:link="mailnews_account_settings.xhtml#copies_and_folders"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="Mail_and_Newsgroups:copying_folders"
          nc:name="kopírovanie priečinkov"
          nc:link="mail_help.xhtml#moving_or_copying_a_folder"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="Mail_and_Newsgroups:creating_filters"
@@ -1160,32 +1160,32 @@
      <rdf:li>
        <rdf:Description ID="Mail_and_Newsgroups:creating_HTML_mail_messages"
          nc:name="vytvorenie e-mailových správ v kóde HTML"
          nc:link="mail_help.xhtml#creating_html_mail_messages"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="Mail_and_Newsgroups:disk_space_and_storage_settings"
          nc:name="nastavenie miesta na disku a úložiska"
-         nc:link="mail_help.xhtml#synchronization_and_storage"/>
+         nc:link="mailnews_account_settings.xhtml#synchronization_and_storage"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="Mail_and_Newsgroups:filing_messages"
          nc:name="vypĺňanie správ"
          nc:link="mail_help.xhtml#filing_messages_in_folders"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="Mail_and_Newsgroups:forwarding_messages"
          nc:name="preposielanie správ"
          nc:link="mail_help.xhtml#forwarding_a_message"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="Mail_and_Newsgroups:general_preferences"
          nc:name="všeobecné nastavenia pošty"
-         nc:link="mail_help.xhtml#mail_and_newsgroup_preferences"/>
+         nc:link="mailnews_preferences.xhtml#mail_and_newsgroup_preferences"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="Mail_and_Newsgroups:getting_new_messages"
          nc:name="získanie nových správ"
          nc:link="mail_help.xhtml#getting_new_messages"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="Mail_and_Newsgroups:HTML_mail_recipients"
@@ -1200,42 +1200,42 @@
      <rdf:li>
        <rdf:Description ID="Mail_and_Newsgroups:HTML_Message_Source"
          nc:name="zdrojový kód správy v HTML"
          nc:link="mail_help.xhtml#viewing_the_message_source_for_html_messages"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="Mail_and_Newsgroups:identity_settings"
          nc:name="nastavenia identity"
-         nc:link="mail_help.xhtml#account_settings"/>
+         nc:link="mailnews_account_settings.xhtml#account_settings"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="Mail_and_Newsgroups:mail_window_layout"
          nc:name="rozloženie okna pošty"
          nc:link="mail_help.xhtml#choosing_how_you_view_the_mail_window"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="Mail_and_Newsgroups:message_searching"
          nc:name="vyhľadávanie správ"
          nc:link="mail_help.xhtml#searching_through_messages"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="Mail_and_Newsgroups:network_preferences"
          nc:name="nastavenie siete pre poštu a diskusné skupiny"
-         nc:link="mail_help.xhtml#network_and_storage_preferences"/>
+         nc:link="mailnews_preferences.xhtml#network_and_storage_preferences"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="Mail_and_Newsgroups:offline_synchronization_settings"
          nc:name="nastavenie synchronizácie pre režim offline"
-         nc:link="mail_help.xhtml#synchronization_and_storage"/>
+         nc:link="mailnews_account_settings.xhtml#synchronization_and_storage"/>
       </rdf:li>
      <rdf:li>
        <rdf:Description ID="Mail_and_Newsgroups:POP_settings"
          nc:name="nastavenia POP"
-         nc:link="mail_help.xhtml#pop_server_settings"/>
+         nc:link="mailnews_account_settings.xhtml#pop_server_settings"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="Mail_and_Newsgroups:renaming_folders"
          nc:name="premenovanie priečinkov"
          nc:link="mail_help.xhtml#renaming_a_folder"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="Mail_and_Newsgroups:replying_to_messages"
@@ -1265,17 +1265,17 @@
      <rdf:li>
        <rdf:Description ID="Mail_and_Newsgroups:sending_options"
          nc:name="nastavenie odosielania"
          nc:link="mail_help.xhtml#selecting_message_sending_options"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="Mail_and_Newsgroups:SMTP_settings"
          nc:name="nastavenia SMTP"
-         nc:link="mail_help.xhtml#outgoing_server"/>
+         nc:link="mailnews_account_settings.xhtml#outgoing_server"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="Mail_and_Newsgroups:sorting_and_threading_messages"
          nc:name="usporiadanie a triedenie správ"
          nc:link="mail_help.xhtml#sorting_and_threading_messages"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="Mail_and_Newsgroups:using_address_books"
@@ -1350,17 +1350,17 @@
      <rdf:Seq><rdf:li>
        <rdf:Description ID="Newsgroups:getting_started"
          nc:name="začíname s diskusnými skupinami"
          nc:link="mail_help.xhtml#getting_started_with_newsgroups"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="Newsgroups:server_settings"
          nc:name="newsgroup server settings"
-         nc:link="mail_help.xhtml#server_settings"/>
+         nc:link="mailnews_account_settings.xhtml#server_settings"/>
      </rdf:li></rdf:Seq>
    </nc:subheadings>
 </rdf:Description>
 
 <rdf:Description about="help-indexAZ.rdf#o">
    <nc:subheadings>
      <rdf:Seq><rdf:li>
        <rdf:Description ID="OSCP"
@@ -1379,17 +1379,17 @@
    </nc:subheadings>
 </rdf:Description>
 
 <rdf:Description about="#Offline">
    <nc:subheadings>
      <rdf:Seq><rdf:li>
        <rdf:Description ID="Offline:general_preferences"
          nc:name="nastavenia režimu offline"
-         nc:link="mail_help.xhtml#network_and_storage_preferences"/>
+         nc:link="mailnews_preferences.xhtml#network_and_storage_preferences"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="Offline:Mail_and_Newsgroups"
          nc:name="Diskusné skupiny a pošta offline"
          nc:link="mail_help.xhtml#working_offline"/>
      </rdf:li></rdf:Seq>
    </nc:subheadings>
 </rdf:Description>
@@ -1414,17 +1414,17 @@
      <rdf:li>
        <rdf:Description ID="plugins"
          nc:name="zásuvné moduly"
          nc:link="nav_help.xhtml#plugins_and_downloads"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="POP"
          nc:name="POP"
-         nc:link="mail_help.xhtml#about_post_office_protocol"/>
+         nc:link="mailnews_account_settings.xhtml#about_post_office_protocol"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="passwords"
          nc:name="Heslá"
          nc:link="passwords_help.xhtml#passwords"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="popup_windows"
@@ -1514,17 +1514,17 @@
    </nc:subheadings>
 </rdf:Description>
 
 <rdf:Description about="#POP">
    <nc:subheadings>
      <rdf:Seq><rdf:li>
        <rdf:Description ID="POP:server_settings"
          nc:name="Nastavenie servera POP"
-         nc:link="mail_help.xhtml#pop_server_settings"/>
+         nc:link="mailnews_account_settings.xhtml#pop_server_settings"/>
      </rdf:li></rdf:Seq>
    </nc:subheadings>
 </rdf:Description>
 
 <rdf:Description about="#popup_windows">
    <nc:subheadings>
      <rdf:Seq><rdf:li>
        <rdf:Description ID="popup_windows:preferences"
@@ -1769,27 +1769,27 @@
      <rdf:Seq><rdf:li>
        <rdf:Description ID="resetting_master_password"
          nc:name="vynulovanie hlavného hesla"
          nc:link="passwords_help.xhtml#reset_master_password"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="return_receipts"
          nc:name="potvrdenie o prečítaní"
-         nc:link="mail_help.xhtml#return_receipts"/>
+         nc:link="mailnews_account_settings.xhtml#return_receipts"/>
      </rdf:li></rdf:Seq>
    </nc:subheadings>
 </rdf:Description>
 
 <rdf:Description about="#return_receipts">
    <nc:subheadings>
      <rdf:Seq><rdf:li>
        <rdf:Description ID="return_receipts:general_preferences"
          nc:name="nastavenia pre potvrdenia o prečítaní"
-         nc:link="mail_help.xhtml#return_receipts_preferences"/>
+         nc:link="mailnews_preferences.xhtml#return_receipts_preferences"/>
      </rdf:li><rdf:li>
        <rdf:Description ID="return_receipts:using"
          nc:name="používanie potvrdení o prečítaní"
          nc:link="mail_help.xhtml#confirming_that_your_message_was_opened"/>
      </rdf:li></rdf:Seq>
    </nc:subheadings>
 </rdf:Description>
 
@@ -1940,17 +1940,17 @@
      <rdf:Seq><rdf:li>
        <rdf:Description ID="settings:certificate"
          nc:name="nastavenia certifikátov"
          nc:link="certs_prefs_help.xhtml#certificate_settings"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="settings:signed_and_encrypted mail"
          nc:name="nastavenia pre podpísané a šifrované správy"
-         nc:link="mail_help.xhtml#security"/>
+         nc:link="mailnews_account_settings.xhtml#security"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="settings:SSL"
          nc:name="nastavenia SSL"
          nc:link="ssl_help.xhtml#ssl_settings"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="settings:validation"
@@ -2010,22 +2010,22 @@
    </nc:subheadings>
 </rdf:Description>
 
 <rdf:Description about="#SMTP">
    <nc:subheadings>
      <rdf:Seq><rdf:li>
        <rdf:Description ID="SMTP:choosing_a_different"
          nc:name="výber iného servera SMTP"
-         nc:link="mail_help.xhtml#account_settings"/>
+         nc:link="mailnews_account_settings.xhtml#account_settings"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="SMTP:server_settings"
          nc:name="nastavenia servera SMTP"
-         nc:link="mail_help.xhtml#outgoing_server"/>
+         nc:link="mailnews_account_settings.xhtml#outgoing_server"/>
      </rdf:li></rdf:Seq>
    </nc:subheadings>
 </rdf:Description>
 
 <rdf:Description about="#SSL">
    <nc:subheadings>
      <rdf:Seq><rdf:li>
        <rdf:Description ID="SSL:preferences"
@@ -2114,17 +2114,17 @@
    </nc:subheadings>
 </rdf:Description>
 
 <rdf:Description about="#Tags">
    <nc:subheadings>
      <rdf:Seq><rdf:li>
        <rdf:Description ID="Tags:general_preferences"
          nc:name="nastavenia značiek"
-         nc:link="mail_help.xhtml#tags"/>
+         nc:link="mailnews_preferences.xhtml#tags"/>
      </rdf:li></rdf:Seq>
    </nc:subheadings>
 </rdf:Description>
 
 <rdf:Description about="#toolbar">
    <nc:subheadings>
      <rdf:Seq><rdf:li>
        <rdf:Description ID="toolbar:hiding_a_toolbar"
--- a/suite/chrome/common/help/mail_help.xhtml
+++ b/suite/chrome/common/help/mail_help.xhtml
@@ -64,19 +64,19 @@
       Programs</a></li>
     <li><a href="#getting_started_with_newsgroups">Getting Started with
       Newsgroups</a></li>
     <li><a href="#getting_started_with_blogs_and_news_feeds">Getting Started
       with Blogs &amp; News Feeds</a></li>
     <li><a href="#working_offline">Working Offline</a></li>
     <li><a href="mail_sec_help.xhtml">Signing &amp; Encrypting
       Messages</a></li>
-    <li><a href="#mail_and_newsgroups_account_settings">Mail &amp; Newsgroups
+    <li><a href="mailnews_account_settings.xhtml">Mail &amp; Newsgroups
       Account Settings</a></li>
-    <li><a href="#mail_and_newsgroup_preferences">Mail &amp; Newsgroups
+    <li><a href="mailnews_preferences.xhtml">Mail &amp; Newsgroups
       Preferences</a></li>
   </ul>
 </div>
 
 <h1 id="getting_started_with_mozilla_mail_and_newsgroups">Getting Started with
   &brandShortName; Mail &amp; Newsgroups</h1>
 
 <div class="contentsBox">In this section:
@@ -149,18 +149,18 @@
   <li><strong>Identity</strong>: Enter the name and email address appropriate
     for this account, then click the right arrow. This window is not available
     for the Blogs &amp; News Feeds account type.</li>
   <li><strong>Server Information</strong>: This window is not available for
     for the Blogs &amp; News Feeds account type.
     <ul>
       <li>Indicate whether you want a POP account or an IMAP account. Not all
         service providers can support both options. For more information, see
-        <a href="#server_settings">Mail &amp; Newsgroups Account Settings -
-        Server Settings</a>.</li>
+        <a href="mailnews_account_settings.xhtml#server_settings">Mail &amp;
+        Newsgroups Account Settings - Server Settings</a>.</li>
       <li>Enter the name of your incoming mail server.</li>
       <li>If you want this account to be a part of the Local Folders Global
         Inbox account, check the <q>Use Global Inbox</q> box. Mail for
         this account will then be stored in your Local Folders. Otherwise, if
         the checkbox is unchecked, mail will be stored in its own
         directory.</li>
       <li>Enter the name of your outgoing mail server (SMTP).
 
@@ -233,18 +233,20 @@
         
         <p><strong>Note:</strong> You can&apos;t set a blogs &amp; news feeds
           account as default.</p>
       </li>
       <li><strong>Remove Account</strong>: Select an account, then click this
         button to remove it completely from your Mail window.</li>
       <li><strong>Outgoing Server (SMTP)</strong>: Click this (at the bottom of
         the list of accounts) to modify information about the outgoing mail
-        server. See <a href="#outgoing_server">Mail &amp; Newsgroups Account
-        Settings - Outgoing Server (SMTP)</a> for more information.</li>
+        server. See
+        <a href="mailnews_account_settings.xhtml#outgoing_server">Mail &amp;
+        Newsgroups Account Settings - Outgoing Server (SMTP)</a> for more
+        information.</li>
     </ul>
   </li>
   <li>Click headings under any account&apos;s name and modify the corresponding
     settings in the panel on the right.</li>
   <li>Click OK to save your changes.</li>
 </ol>
 
 <p>[<a href="#getting_started_with_mozilla_mail_and_newsgroups">Return to
@@ -262,60 +264,64 @@
   <li>Click the account name in the left-hand side of the Account Settings
     dialog box. You see information about the account, such as your email
     address and signature, in the right side of the dialog box.</li>
   <li>Click any of these items beneath the name of an account to see the
     corresponding settings:
     <ul>
       <li><strong>Server Settings</strong>: The settings available depend on
         the type of server (IMAP, POP, or newsgroup server). For more
-        information, see <a href="#server_settings">Mail &amp; Newsgroups
-        Account Settings - Server Settings</a>.
+        information, see
+        <a href="mailnews_account_settings.xhtml#server_settings">Mail &amp;
+        Newsgroups Account Settings - Server Settings</a>.
 
         <p><strong>Important</strong>: If you need to change the server type
           (for example, from POP to IMAP) you must first remove the existing
           account. Next, you must exit &brandShortName; and restart it. You can
           then reopen the Mail &amp; Newsgroups Account Settings dialog box and
           recreate an account with the new server type by clicking Add
           Account.</p>
       </li>
       <li><strong>Copies &amp; Folders</strong>: These settings determine
         whether to send automatic messages (blind carbon copies) and where you
         want to store copies of outgoing messages, message drafts, and message
-        templates. For more information, see <a href="#copies_and_folders">Mail
+        templates. For more information, see
+        <a href="mailnews_account_settings.xhtml#copies_and_folders">Mail
         &amp; Newsgroups Account Settings - Copies &amp; Folders</a>.</li>
       <li><strong>Composition &amp; Addressing</strong>: These settings allow
         you to choose your default format and quoting behavior when composing a
         message. You can also override the global directory server settings
         specified for all address books in the Preferences dialog box. For more
-        information, see <a href="#addressing">Mail &amp; Newsgroups Account
-        Settings - Composition &amp; Addressing</a>.</li>
+        information, see
+        <a href="mailnews_account_settings.xhtml#addressing">Mail &amp;
+        Newsgroups Account Settings - Composition &amp; Addressing</a>.</li>
       <li><strong>Synchronization &amp; Storage (IMAP and News accounts
         only)</strong>: These settings apply when you are working offline
         (disconnected from the Internet) or need to save download time and
         conserve disk space. For more information, see
-        <a href="#synchronization_and_storage_settings_imap">Synchronization
+        <a href="mailnews_account_settings.xhtml#synchronization_and_storage_settings_imap">Synchronization
         &amp; Storage Settings (IMAP)</a> or
-        <a href="#synchronization_and_storage_settings_nntp">Synchronization
+        <a href="mailnews_account_settings.xhtml#synchronization_and_storage_settings_nntp">Synchronization
         &amp; Storage Settings (News)</a>.</li>
       <li><strong>Disk Space (POP and blogs &amp; news feeds accounts
         only)</strong>: This setting helps you manage the amount of disk
         space that downloaded messages take up on your hard disk. For more
-        information, see <a href="#disk_space_settings_pop">Disk Space Settings
-        (POP)</a> or <a href="#disk_space_settings_blog">Disk Space Settings
-        (Blogs)</a>.</li>
+        information, see
+        <a href="mailnews_account_settings.xhtml#disk_space_settings_pop">Disk
+        Space Settings (POP)</a> or <a href="#disk_space_settings_blog">Disk
+        Space Settings (Blogs)</a>.</li>
       <li><strong>Security</strong>: These settings determine which
         <a href="glossary.xhtml#certificate">certificates</a> are used to
         digitally sign and encrypt mail messages that you send. Digital
         signatures allow you to identify yourself reliably to others in
         mail messages that you send. Encryption helps ensure that your
         messages remain private while they are in transit over the
         Internet. For more information, see
-        <a href="#security">Mail &amp; Newsgroups Account Settings -
-        Security</a>.</li>
+        <a href="mailnews_account_settings.xhtml#security">Mail &amp;
+        Newsgroups Account Settings - Security</a>.</li>
     </ul>
   </li>
   <li>Click OK to save your changes.</li>
 </ol>
 
 <p>[<a href="#getting_started_with_mozilla_mail_and_newsgroups">Return to
   beginning of section</a>]</p>
 
@@ -339,19 +345,19 @@
 
 <p>For an IMAP account, you can retrieve new messages automatically and display
   them in the Inbox by opening Mail &amp; Newsgroups and selecting the Inbox
   for the IMAP account.</p>
 
 <p>For a POP account, you must select the Inbox and click Get Msgs to retrieve
   your messages. By default, messages from your POP account are downloaded in
   full and deleted from the POP server when you retrieve them. You can
-  <a href="#pop_server_settings">change your POP server settings</a> to
-  retrieve just the headers and/or store a copy of messages on the server in
-  addition to downloading them to your computer.</p>
+  <a href="mailnews_account_settings.xhtml#pop_server_settings">change your POP
+  server settings</a> to retrieve just the headers and/or store a copy of
+  messages on the server in addition to downloading them to your computer.</p>
   
 <p>For news accounts, expanding the account newsgroups list will automatically
   check for new items, as it will by just selecting one of the newsgroups.
   While reading a newsgroup, you can force checking for new items by clicking
   Get Msgs.</p>
 
 <p>For blogs &amp; feeds accounts, the first time you expand the account, it
   will be checked for new items. Besides that, you can force checking for new
@@ -406,18 +412,19 @@
         Msgs in the Mail window.</li>
     </ul>
   </li>
   <li>Click OK. Your settings take effect the next time you start
     &brandShortName; Mail &amp; Newsgroups.</li>
 </ol>
 
 <p>To set up &brandShortName; Mail &amp; Newsgroups to play a sound or display
-  an alert when new mail arrives, see <a href="#notifications">Mail &amp;
-  Newsgroups Preferences - Notifications</a>.</p>
+  an alert when new mail arrives, see <a
+  href="mailnews_preferences.xhtml#notifications">Mail &amp; Newsgroups
+  Preferences - Notifications</a>.</p>
 
 <p>You can always retrieve messages manually at any time. To get new messages
   for the selected account or newsgroup, do one of the following:</p>
 
 <ul>
   <li>Click Get Msgs on the Mail toolbar.</li>
   <li>Open the File menu (in the Mail window) and choose Get New Messages.</li>
 </ul>
@@ -523,23 +530,23 @@
 </table>
 
 <p><strong>Tip</strong>: The thread button automatically sorts the threads by
   the age of their parent messages. If you want to use another sort criterion
   for the threads, open the View menu and select the desired option from the
   Sort by submenu.</p>
 
 <p><strong>Tip</strong>: Select <q>Preserve threading when sorting messages</q>
-  in the <a href="#mail_and_newsgroups">Mail &amp; Newsgroups Preferences</a>
-  if you want &brandShortName; to preserve the threaded message grouping when
-  sorting messages with column header clicks. The thread button just toggles
-  between threaded and unthreaded message grouping in this mode. If <q>Preserve
-  threading when sorting messages</q> is not selected, &brandShortName;
-  automatically displays the messages unthreaded when you sort them by clicking
-  on a column header.</p>
+  in the <a href="mailnews_preferences.xhtml#mail_and_newsgroups">Mail &amp;
+  Newsgroups Preferences</a> if you want &brandShortName; to preserve the
+  threaded message grouping when sorting messages with column header clicks. The
+  thread button just toggles between threaded and unthreaded message grouping in
+  this mode. If <q>Preserve threading when sorting messages</q> is not selected,
+  &brandShortName; automatically displays the messages unthreaded when you sort
+  them by clicking on a column header.</p>
 
 <p><strong>Tip</strong>: To help you identify unread messages in a collapsed
   thread where you&apos;ve read the parent message, &brandShortName; Mail &amp;
   Newsgroups underlines the parent message.</p>
 
 <p>[<a href="#reading_messages">Return to beginning of section</a>]</p>
 
 <h2 id="saving_and_printing_messages">Saving and Printing Messages</h2>
@@ -640,20 +647,21 @@
   <li>Click Compose on the Mail toolbar.</li>
   <li>While displaying a message, click Reply, Forward, or Reply All on the
     Mail toolbar.</li>
   <li>From the Address Book window, select an address and click Compose on the
     Address Book.</li>
 </ul>
 
 <p><strong>Tip</strong>: Use the Mail &amp; Newsgroups Account Settings - 
-  <a href="#addressing">Composition &amp; Addressing</a> dialog box to specify
-  the HTML text editor to use for composing messages sent from this account.
-  (You can specify a different editor for each of your accounts.) See
-  <a href="#changing_the_settings_for_an_account">Changing the Settings for an
+  <a href="mailnews_account_settings.xhtml#addressing">Composition &amp;
+  Addressing</a> dialog box to specify the HTML text editor to use for
+  composing messages sent from this account. (You can specify a different
+  editor for each of your accounts.) See <a
+  href="#changing_the_settings_for_an_account">Changing the Settings for an
   Account</a> for more information.</p>
 
 <p><strong>Note</strong>: It is generally not possible to compose messages for
   them to be published in blogs &amp; news feeds accounts. If you want to
   publish posts in a blog (and you have the appropiate rights to do it), you
   will need to use the mechanisms provided by the specific blog system. In some
   cases, this can even include sending a mail message to a specific address.</p>
 
@@ -667,19 +675,20 @@
 
 <p>[<a href="#sending_messages">Return to beginning of section</a>]</p>
 
 <h2 id="using_the_message_composition_window">Using the Message Composition
   Window</h2>
 
 <p>Use the Compose window to address, compose, and send mail and newsgroup
   messages. First specify whether you want to compose messages in plain text or
-  HTML by default in the <a href="#addressing">Composition &amp; Addressing</a>
-  Preferences panel (open the Edit menu and choose Mail &amp; Newsgroups
-  Account Settings).</p>
+  HTML by default in the <a
+  href="mailnews_account_settings.xhtml#addressing">Composition &amp;
+  Addressing</a> Preferences panel (open the Edit menu and choose Mail &amp;
+  Newsgroups Account Settings).</p>
 
 <p>To view the Compose window, click the Compose button on the Mail
   toolbar.</p>
 
 <p>The Compose window contains the following:</p>
 
 <ul>
   <li>Mail Toolbar
@@ -719,22 +728,24 @@
 
 <h2 id="addressing_a_message">Addressing a Message</h2>
 
 <p>To address a mail message:</p>
 
 <ol>
   <li>Type the name in the addressing area.
 
-    <p>If you have <a href="#address_autocompletion">address autocompletion</a>
-      enabled (it&apos;s enabled by default), type the first few letters of
-      the recipient&apos;s name and wait for Mail &amp; Newsgroups to complete
-      the address. (Or you can type part of the name and immediately press
-      <kbd class="mac">Return</kbd><kbd class="noMac">Enter</kbd> to have Mail
-      &amp; Newsgroups try to complete the address.)</p>
+    <p>If you have <a
+      href="mailnews_preferences.xhtml#address_autocompletion">address
+      autocompletion</a> enabled (it&apos;s enabled by default), type the first
+      few letters of the recipient&apos;s name and wait for Mail &amp;
+      Newsgroups to complete the address. (Or you can type part of the name and
+      immediately press <kbd class="mac">Return</kbd><kbd
+      class="noMac">Enter</kbd> to have Mail &amp; Newsgroups try to complete
+      the address.)</p>
   </li>
   <li>If multiple addresses are displayed, select an address and press
     <kbd class="mac">Return</kbd><kbd class="noMac">Enter</kbd>.
 
     <p><strong>Note</strong>: Use a comma to separate multiple addresses on the
       same line. Do not use a comma to separate first or last names. For
       example, multiple entries might be:</p>
 
@@ -825,18 +836,18 @@
   <li><strong>Quote Message</strong>: Choose this option to have the selection
     of the message text shown as quoted text.</li>
   <li><strong>Return Receipt</strong>: Choose this option to request a
     confirmation message when the recipient displays (opens) the message. Keep
     in mind that the recipient may choose not to send you a return receipt.
     This option lets you enable or disable return receipt requests on a
     per-message basis. To automatically request return receipts for all
     messages you send, use the return receipts preferences. See
-    <a href="#return_receipts_preferences">Mail &amp; Newsgroups Preferences -
-    Return Receipts</a> for more information.</li>
+    <a href="mailnews_preferences.xhtml#return_receipts_preferences">Mail &amp;
+    Newsgroups Preferences - Return Receipts</a> for more information.</li>
   <li><strong>Format</strong>: Send the message as plain text, or HTML
     (formatted), or both. If you choose <q>Auto-Detect</q>, Mail &amp;
     Newsgroups prompts you for the format to use if it&apos;s unknown whether
     the recipient&apos;s mail program can display an HTML message. The format
     you choose here overrides the send format you specified using the
     Preferences command on the <span class="mac">&brandShortName;</span>
     <span class="noMac">Edit</span> menu.</li>
   <li><strong>Priority</strong>: Choose a priority to indicate whether the
@@ -852,20 +863,20 @@
 
 <p>An additional message formatting option is available from the Edit menu:</p>
 
 <ul>
   <li><strong>Rewrap</strong>: If you are composing a message using the
     plain-text editor, you can use the Rewrap command to rewrap long lines of
     quoted text to fit the Compose window. This command rewraps selected quoted
     text to the number of characters specified by the
-    <a href="#composition">Composition</a> preferences. This command is
-    primarily useful when you are replying to a message where the original
-    message is quoted in your reply, and the original message contains long
-    lines.
+    <a href="mailnews_preferences.xhtml#composition">Composition</a>
+    preferences. This command is primarily useful when you are replying to a
+    message where the original message is quoted in your reply, and the original
+    message contains long lines.
 
     <p>You use the Mail &amp; Newsgroups Account Settings command on the Edit
       menu to specify that you want to use the plain-text editor for composing
       messages. Select the Composition &amp; Addressing panel of the account
       and uncheck <q>Compose messages in HTML format</q> to use the plain-text
       editor for all messages. If you only want to use the plain-text editor
       occasionally, you can hold down the Shift key while clicking the Compose
       or the Reply button to use the plain-text editor on an as-needed
@@ -887,35 +898,37 @@
 
 <p>To include the original message each time you reply to any message, and to
   specify how to place the original message in the reply:</p>
 
 <ol>
   <li>Open the Edit menu and choose Mail &amp; Newsgroups Account Settings.
     You see the Mail &amp; Newsgroups Account Settings dialog box.</li>
   <li>If you have multiple accounts, select an account and click the
-    <a href="#addressing">Composition &amp; Addressing</a> category for that
-    account.</li>
+    <a href="mailnews_account_settings.xhtml#addressing">Composition &amp;
+    Addressing</a> category for that account.</li>
   <li>Select <q>Automatically quote the original message when
     replying</q>.</li>
   <li>Specify where in the message to place your reply. <q>Start my reply below
     the quote</q> is the default.</li>
-  <li>If you have decided to <a href="#account_settings">attach a signature</a>
-    to every outgoing message and selected to start your reply above the quote
-    here, you can additionally configure where your signature is placed:
+  <li>If you have decided to <a
+    href="mailnews_account_settings.xhtml#account_settings">attach a
+    signature</a> to every outgoing message and selected to start your reply
+    above the quote here, you can additionally configure where your signature
+    is placed:
     <ul>
       <li>Select <q>below the quote (recommended)</q> to place your signature
         at the very end of the message below the quoted text.</li>
       <li>Select <q>below my reply (above the quote)</q> to place your
         signature between your reply and the quoted text.</li>
     </ul>
 
     <p><strong>Note</strong>: If you have created a signature, you can
-      optionally <a href="#addressing">omit it</a> when replying to a
-      message.</p>
+      optionally <a href="mailnews_account_settings.xhtml#addressing">omit
+      it</a> when replying to a message.</p>
   </li>
   <li>Click OK.</li>
 </ol>
 
 <p>[<a href="#sending_messages">Return to beginning of section</a>]</p>
 
 <h2 id="forwarding_a_message">Forwarding a Message</h2>
 
@@ -932,25 +945,26 @@
 </ol>
 
 <p>To set the default for forwarding messages:</p>
 
 <ol>
   <li>Open the <span class="mac">&brandShortName;</span>
     <span class="noMac">Edit</span> menu and choose Preferences.</li>
   <li>Under the Mail &amp; Newsgroups category, click
-    <a href="#composition">Composition</a>. (If no subcategories are visible,
-    double-click Mail &amp; Newsgroups to expand the list.)</li>
+    <a href="mailnews_preferences.xhtml#composition">Composition</a>. (If no
+    subcategories are visible, double-click Mail &amp; Newsgroups to expand the
+    list.)</li>
   <li>For forwarding messages, choose Inline (in the message body) or As
     Attachment.
 
     <p><strong>Note</strong>: If you have created a signature and forward
       inline, its placement depends on the respective reply setting. You can
-      optionally <a href="#addressing">omit the signature</a> when forwarding
-      a message.</p>
+      optionally <a href="mailnews_account_settings.xhtml#addressing">omit the
+      signature</a> when forwarding a message.</p>
   </li>
   <li>Click OK.</li>
 </ol>
 
 <p><strong>Tip</strong>: To override the default for forwarding a message,
   select the message, open the Message menu, and choose Forward As, then
   choose Inline or Attachment.</p>
 
@@ -963,44 +977,45 @@
   (opened) your message. The recipient must be using a mail program that
   supports the Message Disposition Notification (MDN) standard. Keep in mind
   that the recipient may choose not to send you a return receipt, even if
   you&apos;ve requested one. Messages you send to a newsgroup address will not
   include a return receipt request, since news servers don&apos;t support this
   feature.</p>
 
 <p>To request return receipts for all messages you send, you can use the global
-  <a href="#return_receipts_preferences">Return Receipt</a> preferences to
-  specify how to manage requests you receive for return receipts. You can
-  override these global preferences for individual accounts.</p>
+  <a href="mailnews_preferences.xhtml#return_receipts_preferences">Return
+  Receipt</a> preferences to specify how to manage requests you receive for
+  return receipts. You can override these global preferences for individual
+  accounts.</p>
 
 <p>To request a return receipt on a per-message basis:</p>
 
 <ul>
   <li>From a Mail Compose window, open the Options menu, and choose Return
     Receipt.</li>
 </ul>
 
 <p>To automatically request return receipts when sending messages from each of
   your mail accounts:</p>
 
 <ol>
   <li>Open the <span class="mac">&brandShortName;</span>
     <span class="noMac">Edit</span> menu and choose Preferences.</li>
   <li>Under the Mail &amp; Newsgroups category, click
-    <a href="#return_receipts_preferences">Return Receipts</a>. (If no
-    subcategories are visible, double-click Mail &amp; Newsgroups to expand the
-    list.)</li>
+    <a href="mailnews_preferences.xhtml#return_receipts_preferences">Return
+    Receipts</a>. (If no subcategories are visible, double-click Mail &amp;
+    Newsgroups to expand the list.)</li>
   <li>Select <q>When sending messages, always request a return receipt</q>.</li>
   <li>Click OK.</li>
 </ol>
 
 <p>For more information on setting return receipt preferences, see
-  <a href="#return_receipts_preferences">Mail &amp; Newsgroups Preferences -
-  Return Receipts</a>.</p>
+  <a href="mailnews_preferences.xhtml#return_receipts_preferences">Mail &amp;
+  Newsgroups Preferences - Return Receipts</a>.</p>
 
 <p>[<a href="#sending_messages">Return to beginning of section</a>]</p>
 
 <h2 id="saving_and_editing_a_message_draft">Saving and Editing a Message
   Draft</h2>
 
 <p>To save a mail message as a draft so you can complete it later:</p>
 
@@ -1177,18 +1192,19 @@
 
 <p>To choose sending-format options for mail messages, begin from the Mail
   window:</p>
 
 <ol>
   <li>Open the <span class="mac">&brandShortName;</span>
     <span class="noMac">Edit</span> menu and choose Preferences.</li>
   <li>Under the Mail &amp; Newsgroups category, click
-    <a href="#send_format">Send Format</a>. (If no subcategories are visible,
-    double-click Mail &amp; Newsgroups to expand the list).
+    <a href="mailnews_preferences.xhtml#send_format">Send Format</a>. (If no
+    subcategories are visible, double-click Mail &amp; Newsgroups to expand the
+    list).
 
     <p><strong>Note</strong>: This preference applies only to mail messages,
       not to newsgroup messages.</p>
   </li>
   <li>Select the option you want and then click OK.</li>
 </ol>
 
 <p>If while composing a message you realize that one or more recipients may not
@@ -1432,18 +1448,19 @@
 
 <p>To set deletion preferences for IMAP messages:</p>
 
 <ol>
   <li>Open the Edit menu and choose Mail &amp; Newsgroups Account Settings. You
     see the Mail &amp; Newsgroups Account Settings dialog box.</li>
   <li>Locate the IMAP account you want, and then click the Server Settings
     category under the account name.</li>
-  <li>Select the <a href="#when_i_delete_a_message">options</a> you want for
-    deleting messages and click OK.</li>
+  <li>Select the <a
+    href="mailnews_account_settings.xhtml#when_i_delete_a_message">options</a>
+    you want for deleting messages and click OK.</li>
 </ol>
 
 <p>[<a href="#deleting_messages">Return to beginning of section</a>]</p>
 
 <h2 id="moving_messages_to_and_from_the_trash">Moving Messages To and From the
   Trash</h2>
 
 <p>If you use a POP server to deliver your mail, or if you set up IMAP to use
@@ -1523,17 +1540,18 @@
   messages are stored in the Collected Addresses as soon as you click Send.</p>
 
 <h4>LDAP Directory (if available)</h4>
 
 <p>An LDAP directory (also known as an address lookup service) stores email
   addresses of recipients who are not in your locally-stored address books.
   LDAP directories offer you access to large, centrally maintained databases
   of email addresses, which is especially useful with
-  <a href="#address_autocompletion">address autocompletion</a>.</p>
+  <a href="mailnews_preferences.xhtml#address_autocompletion">address
+  autocompletion</a>.</p>
 
 <p>Automatic address collection is enabled by default. To change automatic
   address collection settings, begin in the Mail window:</p>
 
 <ol>
   <li>Open the <span class="mac">&brandShortName;</span>
     <span class="noMac">Edit</span> menu and choose Preferences.</li>
   <li>Under the Mail &amp; Newsgroups category, click Addressing. (If no
@@ -2746,17 +2764,18 @@ to filter unwanted mail, and how phishin
   
   <li>Open the Edit menu, and choose Mail &amp; Newsgroups Account Settings.
     You see the Mail &amp; Newsgroups Account Settings dialog box.</li>
   <li>Click the Junk Settings category for your mail account.</li>
   <li>Enable the feature and &brandShortName; will automatically classify
     incoming messages. (See
     <a href="#junk_controls_options">Junk Mail Controls Options</a>.
     Details on the other settings there can be found in the 
-    <a href="#junk_settings">Junk Settings</a> preference panel description.)
+    <a href="mailnews_account_settings.xhtml#junk_settings">Junk Settings</a>
+    preference panel description.)
   </li>
   <li>If you have trained it on virus mail, consider disabling the white
     listing (many mail viruses send bulk messages to people in the address book
     of the infected computer).</li>
   <li>Make sure to correct the Junk Mail Controls when it incorrectly labels
     messages either as junk or not junk.</li>
   <li>To analyze existing messages, select messages, open the Tools menu
     and choose <q>Run Junk Mail Controls</q>.</li>
@@ -2767,20 +2786,20 @@ to filter unwanted mail, and how phishin
   Controls do not work, select some messages and explicitly mark them as Not
   Junk.</p>
 
 <p>[<a href="#controlling_junk_mail">Return to beginning of section</a>]</p>
 
 <h2 id="junk_controls_options">Junk Mail Controls Options</h2>
 
 <p>To fine-tune how Junk Mail Controls work, use the 
-  <a href="#junk_and_suspect_preferences">Junk &amp; Suspect Mail preference
-  panel</a> for account-independent settings and the account manager's
-  <a href="#junk_settings">Junk Settings</a> for settings of a specific mail
-  account.</p>
+  <a href="mailnews_preferences.xhtml#junk_and_suspect_preferences">Junk &amp;
+  Suspect Mail preference panel</a> for account-independent settings and the
+  account manager's <a href="mailnews_account_settings.xhtml#junk_settings">Junk
+  Settings</a> for settings of a specific mail account.</p>
 
 <p>[<a href="#controlling_junk_mail">Return to beginning of section</a>]</p>
 
 <h2 id="junk_controls_and_filters">Junk Mail Controls and Filters</h2>
 
 <p>Junk Mail Controls run after mail filters (unless you set the filter to run
   after classification, where <q>classification</q> includes junk and phishing
   scanning) and apply only to the Inbox folder and its sub-folders. Use this to
@@ -3546,18 +3565,18 @@ to filter unwanted mail, and how phishin
   replicating any changes you made while working offline.</p>
 
 <p><strong>Tip</strong>: &brandShortName; Mail &amp; Newsgroups saves any
   messages that you send while working offline in the Unsent Messages folder
   under Local Folders. To have &brandShortName; Mail &amp; Newsgroups
   automatically send your unsent messages when you reconnect, use the
   Preferences command on the <span class="mac">&brandShortName;</span>
   <span class="noMac">Edit</span> menu to change the
-  <a href="#network_and_storage_preferences">offline preferences</a> for all
-  your accounts.</p>
+  <a href="mailnews_preferences.xhtml#network_and_storage_preferences">offline
+  preferences</a> for all your accounts.</p>
 
 <p>[<a href="#working_offline">Return to beginning of section</a>]</p>
 
 <h2 id="downloading_an_individual_folder_for_offline_use">Downloading an
   Individual Folder for Offline Use</h2>
 
 <p>Note that POP accounts don&apos;t allow you to manage folders on the POP
   server, so this section does not apply to POP accounts.</p>
@@ -3602,17 +3621,18 @@ to filter unwanted mail, and how phishin
 
 <p><strong>Tip</strong>: &brandShortName; Mail &amp; Newsgroups saves any
   messages that you sent while working offline in the Unsent Messages folder
   under Local Folders. When you reconnect, choose Send Unsent Messages from the
   File menu to send all your saved messages at once. To have &brandShortName;
   Mail &amp; Newsgroups automatically send your unsent messages when you
   reconnect, use the Preferences command on the
   <span class="mac">&brandShortName;</span> <span class="noMac">Edit</span>
-  menu to change your <a href="#network_and_storage_preferences">offline
+  menu to change your <a
+  href="mailnews_preferences.xhtml#network_and_storage_preferences">offline
   preferences</a>.</p>
 
 <p>[<a href="#working_offline">Return to beginning of section</a>]</p>
 
 <h2 id="downloading_selected_or_flagged_messages_for_offline_use">Downloading
   Selected or Flagged Messages for Offline Use</h2>
 
 <p>Note that messages are downloaded by default for POP accounts. However, if
@@ -3673,17 +3693,18 @@ to filter unwanted mail, and how phishin
 
 <p><strong>Tip</strong>: &brandShortName; Mail &amp; Newsgroups saves any
   messages that you sent while working offline in the Unsent Messages folder
   under Local Folders. When you reconnect, choose Send Unsent Messages from the
   File menu to send all your saved messages at once. To have &brandShortName;
   Mail &amp; Newsgroups automatically send your unsent messages when you
   reconnect, use the Preferences command on the
   <span class="mac">&brandShortName;</span> <span class="noMac">Edit</span>
-  menu to change your <a href="#network_and_storage_preferences">offline
+  menu to change your <a
+  href="mailnews_preferences.xhtml#network_and_storage_preferences">offline
   preferences</a>.</p>
 
 <p>[<a href="#working_offline">Return to beginning of section</a>]</p>
 
 <h2 id="downloading_directory_entries_for_offline_use">Downloading
   Directory Entries for Offline Use</h2>
 
 <p>You can download (replicate) the entries in a directory server to your
@@ -3736,20 +3757,20 @@ to filter unwanted mail, and how phishin
     &amp; Newsgroups Account Settings dialog box to set the Synchronization
     &amp; Storage preferences for that account. You must select the items
     (folders and newsgroups) that you want to download for offline use. See
     <a href="#selecting_items_for_offline_viewing">Selecting Items for Offline
     Viewing</a> for more information.
 
     <p>Once set, you don&apos;t need to change these settings. See the sections
       below for information on setting offline and disk space preferences for
-      <a href="#synchronization_and_storage_settings_imap">IMAP</a>,
-      <a href="#disk_space_settings_pop">POP</a>,
-      <a href="#disk_space_settings_blogs">Blogs</a>, and
-      <a href="#synchronization_and_storage_settings_nntp">Newsgroup</a>
+      <a href="mailnews_account_settings.xhtml#synchronization_and_storage_settings_imap">IMAP</a>,
+      <a href="mailnews_account_settings.xhtml#disk_space_settings_pop">POP</a>,
+      <a href="mailnews_account_settings.xhtml#disk_space_settings_blogs">Blogs</a>, and
+      <a href="mailnews_account_settings.xhtml#synchronization_and_storage_settings_nntp">Newsgroup</a>
       accounts.</p>
 
     <p><strong>Tip</strong>: To set the Synchronization &amp; Storage
       preferences for the current account, open the File menu, choose Offline,
       and then choose Offline Settings.</p>
   </li>
   <li>Open the File menu, choose Offline, and then choose Download/Sync Now
     from the submenu.</li>
@@ -3898,1705 +3919,10 @@ to filter unwanted mail, and how phishin
   behavior when going online, open the
   <span class="mac">&brandShortName;</span> <span class="noMac">Edit</span>
   menu, choose Preferences, and then choose the Synchronization &amp; Storage
   category. You can choose to have &brandShortName; Mail &amp; Newsgroups
   prompt you to send unsent messages, to automatically send unsent messages,
   or to not send unsent messages.</p>
 
 <p>[<a href="#working_offline">Return to beginning of section</a>]</p>
-
-<h1 id="mail_and_newsgroups_account_settings">Mail &amp; Newsgroups Account
-  Settings</h1>
-
-<p>This section describes the settings in the Mail &amp; Newsgroups Account
-  Settings dialog box. Unlike the Preferences dialog box, which applies
-  settings to all accounts, the Mail &amp; Newsgroups Account Settings dialog
-  box lets you specify settings on a per-account basis.</p>
-
-<p>If you are not currently viewing the Mail &amp; Newsgroups Account Settings
-  dialog box, follow these steps:</p>
-
-<ol>
-  <li>Begin from the Mail window.</li>
-  <li>Open the Edit menu and choose Mail &amp; Newsgroups Account
-    Settings.</li>
-  <li>Select the name of the account whose settings you want to view or
-    change.</li>
-</ol>
-
-<div class="contentsBox">In this section:
-  <ul>
-    <li><a href="#account_settings">Account Settings</a></li>
-    <li><a href="#server_settings">Server Settings</a></li>
-    <li><a href="#copies_and_folders">Copies &amp; Folders</a></li>
-    <li><a href="#addressing">Composition &amp; Addressing</a></li>
-    <li><a href="#synchronization_and_storage">Synchronization &amp; Storage</a></li>
-    <li><a href="#junk_settings">Junk Settings</a></li>
-    <li><a href="#return_receipts">Return Receipts</a></li>
-    <li><a href="#security">Security</a></li>
-    <li><a href="#local_folders">Local Folders</a></li>
-    <li><a href="#outgoing_server">Outgoing Server (SMTP)</a></li>
-  </ul>
-</div>
-
-<h2 id="account_settings">Mail &amp; Newsgroups Account Settings - Account
-  Settings</h2>
-
-<p>This section describes how to view or change your Account Settings, such as
-  your user name, reply-to address, and signature. If you are not already
-  viewing the Account Settings, begin from the Mail window:</p>
-
-<ol>
-  <li>Open the Edit menu and choose Mail &amp; Newsgroups Account Settings. You
-    see the Mail &amp; Newsgroups Account Settings dialog box.</li>
-  <li>Select the name of the account to display the Account Settings
-    panel.</li>
-</ol>
-
-<ul>
-  <li><strong>Account Name</strong>: The name for this account.</li>
-  <li>For any type of account but Blogs &amp; News Feeds:
-    <ul>
-      <li><strong>Identity</strong>: Stores your name, email address, reply-to
-        address (only if different from your email address), and organization
-        (optional).</li>
-      <li><strong>Signature text</strong>: If you want to attach a signature to
-        all outgoing messages, type its text into this box. Check <strong>Use
-        HTML</strong> to enable HTML code, e.g., &lt;b&gt;bold&lt;/b&gt;
-        (optional).</li>
-      <li><strong>Attach the signature from a file instead</strong>: Lets you
-        choose to attach the signature from a file (in text, HTML, or image
-        format) rather than entering its text. Checking this option overrides
-        any text entered into the signature box. Click Choose to locate the
-        signature file (optional).
-
-        <p>More signature options are located in
-          <a href="#addressing">Composition &amp; Addressing</a>.</p>
-      </li>
-      <li><strong>Attach my vCard to messages</strong>: Lets you choose if your
-        vCard should be attached to your outgoing messages. Click Edit Card to
-        edit the card information (optional).</li>
-    </ul>
-  </li>
-  <li>For Blogs &amp; News Feeds accounts:
-    <ul>
-      <li><strong>Check for new articles at startup</strong>: Select this
-        checkbox if you want to check this account automatically for new blogs
-        &amp; news messages whenever you start Mail &amp; Newsgroups.</li>
-      <li><strong>Check for new articles every [__] minutes</strong>: Select
-        this checkbox if you want to specify the number of minutes between feed
-        checks. You can also check for new blogs &amp; news messages at any time
-        by clicking Get Msgs in the Mail window.</li>
-      <li><strong>By default, show the article summary instead of loading the
-        web page</strong>: Select this checkbox if you want &brandShortName;
-        to display a brief summary of the article (bundled inside the feed)
-        instead of loading the full web page. Showing the article summary is
-        slightly faster than the full web page, but you may miss part of the
-        article content.</li>
-      <li><strong>Empty Trash on Exit</strong>: Empties the Trash folder
-        whenever you quit Mail &amp; Newsgroups.</li>
-      <li><strong>Manage Subscriptions...</strong>: Shows the Feed Subscriptions
-        dialog, that allows you to add, edit and remove feeds to this blogs
-        &amp; news feeds account.</li>
-    </ul>
-  </li>
-</ul>
-
-<p>[<a href="#mail_and_newsgroups_account_settings">Return to beginning of
-  section</a>]</p>
-
-<h2 id="server_settings">Mail &amp; Newsgroups Account Settings - Server
-  Settings</h2>
-
-<p>&brandShortName; Mail &amp; Newsgroups can work with two types of mail
-  servers: IMAP and POP. If you are not sure which server type your Internet
-  service provider supports, ask your service provider. If your Internet
-  service provider supports both, the following descriptions may help you
-  choose which one to use.</p>
-
-<div class="contentsBox">In this section:
-  <ul>
-    <li><a href="#about_internet_message_access_protocol">About Internet
-      Message Access Protocol (IMAP)</a></li>
-    <li><a href="#about_post_office_protocol">About Internet Post Office
-      Protocol (POP)</a></li>
-    <li><a href="#imap_server_settings">IMAP Server Settings</a></li>
-    <li><a href="#advanced_imap_server_settings">Advanced IMAP Server
-      Settings</a></li>
-    <li><a href="#pop_server_settings">POP Server Settings</a></li>
-    <li><a href="#news_server_settings">News Server Settings</a></li>
-  </ul>
-</div>
-
-<p>[<a href="#mail_and_newsgroups_account_settings">Return to beginning of
-  section</a>]</p>
-
-<h3 id="about_internet_message_access_protocol">About Internet Message Access
-  Protocol (IMAP)</h3>
-
-<p><strong>Advantages</strong>: Your messages and any changes to them stay on
-  your server, saving local disk space. Also, you always have access to an
-  updated mailbox, and you can get your mail from multiple locations.
-  Performance on a modem is faster, since you initially download message
-  headers only.</p>
-
-<p><strong>Disadvantages</strong>: Not all ISPs support IMAP.</p>
-
-<p>[<a href="#mail_and_newsgroups_account_settings">Return to beginning of
-  section</a>]</p>
-
-<h3 id="about_post_office_protocol">About Post Office Protocol (POP)</h3>
-
-<p><strong>Advantages</strong>: Your messages are downloaded to your local
-  computer all at once, but you can also specify whether to keep copies of the
-  messages on the server and delete messages on the server when they are
-  deleted locally. Most ISPs currently support POP.</p>
-
-<p><strong>Disadvantages</strong>: If you use more than one computer, messages
-  might reside on one or the other, but not both. POP doesn&apos;t work as well
-  as IMAP over a slow link connection. Also, you can&apos;t access all mail
-  folders from multiple locations.</p>
-
-<p>Note that more recent POP servers have features that allow retrieving only
-  the headers instead of the full message, like IMAP allows. Using these
-  features allows performance with POP to be nearly as fast as with IMAP.</p>
-
-<p>[<a href="#mail_and_newsgroups_account_settings">Return to beginning of
-  section</a>]</p>
-
-<h3 id="imap_server_settings">IMAP Server Settings</h3>
-
-<p>If you are not already viewing the IMAP server settings, begin from the Mail
-  window:</p>
-
-<ol>
-  <li>Open the Edit menu and choose Mail &amp; Newsgroups Account Settings. You
-    see the Mail &amp; Newsgroups Account Settings dialog box.</li>
-  <li>Select the account name and click the Server Settings category. (If you
-    chose an IMAP server when you set up this account, you see your IMAP server
-    settings.)</li>
-</ol>
-
-<ul>
-  <li><strong>Server Type</strong>: The server type (IMAP Mail Server) that you
-    specified when you created this account. To change the server type
-    associated with this account, you must delete the account and then
-    re-create it.</li>
-  <li><strong>Server Name</strong>: The server name that you specified when you
-    created this account. If you are having problems getting mail from this
-    account, verify with your service provider or system administrator that the
-    server name you entered is correct.</li>
-  <li><strong>User Name</strong>: The user name that you specified when you
-    created this account.</li>
-  <li><strong>Port</strong>: Unless otherwise instructed to do so by your
-    service provider or system administrator, leave this setting
-    unchanged.</li>
-  <li><strong>Connection security</strong>: Choose one of the available options
-    to establish a <a href="glossary.xhtml#secure_connection">secure
-    connection</a> to your incoming IMAP server. You can choose one of these:
-    <ul>
-      <li><strong>None</strong>: &brandShortName; will use a plain connection,
-        without encryption at all. You should choose this <strong>only</strong>
-        if your incoming server doesn&apos;t support any type of security.</li>
-      <li><strong>STARTTLS</strong>: Require an encrypted connection, use the
-        <a href="glossary.xhtml#starttls">STARTTLS</a> method. This mechanism
-        will usually run on the standard IMAP port 143.</li>
-      <li><strong>SSL/TLS</strong>: Require an encrypted connection, use the
-        IMAP-over-SSL method. The default port for this is 993.
-      </li>
-    </ul>
-  </li>
-  <li><strong>Use secure authentication</strong>: Choose this setting if you
-    want to use secure mechanisms for logging in like CRAM-MD5. If you are
-    unsure if your service supports this, contact your service provider or
-    system administrator.</li>
-  <li><strong>Check for new messages at startup</strong>: Choose this setting
-    if you want Mail &amp; Newsgroups to automatically check this account for
-    new messages whenever you start Mail &amp; Newsgroups.</li>
-  <li><strong>Check for new messages every [__] minutes</strong>: Choose this
-    setting to automatically check for new messages, and then specify the
-    number of minutes between mail checks. If you do not select this setting,
-    you can check for new messages at any time by clicking Get Msgs in the Mail
-    window.</li>
-  <li id="when_i_delete_a_message"><strong>When I delete a message</strong>:
-    Choose the behavior you want for deleted messages. <q>Move it to this
-    folder</q>, where you can choose the specific folder to use, is recommended
-    unless you are instructed to use a different setting by your system
-    administrator or service provider. Messages marked as deleted are removed
-    only when you compact folders.</li>
-  <li><strong>Clean up (Expunge) Inbox on Exit</strong>: Removes deleted
-    messages from the Inbox when you exit Mail &amp; Newsgroups. Choose this
-    if you chose to mark messages as deleted.</li>
-  <li><strong>Empty Trash on Exit</strong>: Empties the Trash folder whenever
-    you quit Mail &amp; Newsgroups.</li>
-  <li><strong>Advanced</strong>: Lets you choose a different outgoing server
-    (SMTP) for outgoing messages from this account. You can also reach the
-    <a href="#advanced_imap_server_settings">Advanced IMAP Server Settings</a>
-    through this button.</li>
-  <li><strong>Local directory</strong>: The location on your hard disk where
-    mail for this account is stored.</li>
-</ul>
-
-<h3 id="advanced_imap_server_settings">Advanced IMAP Server Settings</h3>
-
-<p>In most cases, advanced IMAP server settings are automatically supplied by
-  the server. If you are unsure about the settings for this dialog box,
-  contact your ISP or system administrator.</p>
-
-<p>If you are not already viewing the advanced IMAP server settings, begin
-  from the Mail window.</p>
-
-<ol>
-  <li>Open the Edit menu and choose Mail &amp; Newsgroups Account Settings. You
-    see the Mail &amp; Newsgroups Account Settings dialog box.</li>
-  <li>Select the account name and click the Server Settings category.</li>
-  <li>If the mail server type is an IMAP server, you can click Advanced to set
-    additional IMAP options, such as:
-    <ul>
-      <li>the IMAP server directory path</li>
-      <li>showing only <q>subscribed folders</q></li>
-      <li>support for subfolders</li>
-      <li>any personal and public (shared folder) namespaces for this
-        directory</li>
-    </ul>
-  </li>
-</ol>
-
-<p>For more information, see
-  <a href="#adding_and_removing_ldap_directories">Adding and Removing LDAP
-  Directories</a>.</p>
-
-<p>[<a href="#mail_and_newsgroups_account_settings">Return to beginning of
-  section</a>]</p>
-
-<h3 id="pop_server_settings">POP Server Settings</h3>
-
-<p>If you are not already viewing the POP server settings, begin from the Mail
-  window:</p>
-
-<ol>
-  <li>Open the Edit menu and choose Mail &amp; Newsgroups Account Settings. You
-    see the Mail &amp; Newsgroups Account Settings dialog box.</li>
-  <li>Select the account name and click the Server Settings category name. (If
-    you chose a POP server when you set up this account, you see your POP
-    server settings.)</li>
-</ol>
-
-<ul>
-  <li><strong>Server Type</strong>: The server type (POP Mail Server) that you
-    specified when you created this account. To change the server type
-    associated with this account, you must delete the account and then
-    re-create it.</li>
-  <li><strong>Server Name</strong>: The server name that you specified when you
-    created this account. If you are having problems getting mail from this
-    account, verify with your service provider or system administrator that the
-    server name you entered is correct.</li>
-  <li><strong>User Name</strong>: The user name that you specified when you
-    created this account.</li>
-  <li><strong>Port</strong>: Unless otherwise instructed to do so by your
-    service provider or system administrator, leave this setting
-    unchanged.</li>
-  <li><strong>Connection security</strong>: Choose one of the available options
-    to establish a <a href="glossary.xhtml#secure_connection">secure
-    connection</a> to your incoming POP server. You can choose one of these:
-    <ul>
-      <li><strong>None</strong>: &brandShortName; will use a plain connection,
-        without encryption at all. You should choose this <strong>only</strong>
-        if your incoming server doesn&apos;t support any type of security.</li>
-      <li><strong>STARTTLS</strong>: Require an encrypted connection, use the
-        <a href="glossary.xhtml#starttls">STARTTLS</a> method. This mechanism
-        will usually run on the standard POP port 110.</li>
-      <li><strong>SSL/TLS</strong>: Require an encrypted connection, use the
-        POP-over-SSL method. The default port for this is 995.
-      </li>
-    </ul>
-  </li>
-  <li><strong>Use secure authentication</strong>: Choose this setting if you
-    want to use secure mechanisms for logging in like CRAM-MD5 and APOP. If you
-    are unsure if your server supports this, contact your service provider or
-    system administrator.</li>
-  <li><strong>Check for new messages at startup</strong>: Choose this setting
-    if you want Mail &amp; Newsgroups to automatically check this account for
-    new messages whenever you start Mail &amp; Newsgroups. For POP accounts,
-    Mail &amp; Newsgroups doesn&apos;t download the new messages until you
-    click Get Msgs on the Mail toolbar.</li>
-  <li><strong>Check for new messages every [__] minutes</strong>: Choose this
-    setting to automatically check for new messages, and then specify the
-    number of minutes between mail checks. If you do not select this setting,
-    you can check for new messages at any time by clicking Get Msgs in the Mail
-    window.</li>
-  <li><strong>Automatically download any new messages</strong>: Choose this
-    setting if you want Mail &amp; Newsgroups to retrieve messages immediately
-    each time it checks the server.</li>
-  <li><strong>Fetch headers only</strong>: Choose this setting if you want to
-    only download the headers instead of entire messages when downloading new
-    mail. This option requires your POP server to support the <q>TOP</q>
-    command. Most recent POP servers support it, but if you are unsure about
-    your server, contact your service provider or system administrator.</li>
-  <li><strong>Leave messages on server</strong>: Choose this setting to store a
-    copy of messages on the mail server in addition to downloading them to your
-    computer.
-    <ul>
-      <li><strong>For at most [__] days</strong>: Choose this setting to remove
-        messages from the server automatically after the number of days you
-        enter here.</li>
-      <li><strong>Until I delete them</strong>: Choose this setting to remove
-        messages from the server once you delete them.</li>
-    </ul>
-  </li>
-  <li><strong>Empty Trash on Exit</strong>: Choose this setting to empty the
-    Trash folder whenever you quit Mail &amp; Newsgroups.</li>
-  <li><strong>Advanced</strong>: Lets you choose where new messages should be
-    put. You can also set the server to be queried when checking for new
-    messages.</li>
-  <li><strong>Local directory</strong>: The location on your hard disk where
-    mail for this account is stored.</li>
-</ul>
-
-<p>[<a href="#mail_and_newsgroups_account_settings">Return to beginning of
-  section</a>]</p>
-
-<h3 id="news_server_settings">News Server Settings</h3>
-
-<p>This section describes how to change news server settings. If you are not
-  already viewing news server settings, begin from the Mail window:</p>
-
-<ol>
-  <li>Open the Edit menu and choose Mail &amp; Newsgroups Account Settings. You
-    see the Mail &amp; Newsgroups Account Settings dialog box.</li>
-  <li>Select the account name and click the Server Settings category. (If you
-    chose a newsgroup server when you set up this account, you see your
-    newsgroup server settings.)</li>
-</ol>
-
-<ul>
-  <li><strong>Server Type</strong>: The server type (NNTP) that you specified
-    when you created this account.</li>
-  <li><strong>Server Name</strong>: The server name that you specified when you
-    created this account. If you are having problems receiving messages from
-    this account, verify with your service provider or system administrator
-    that the server name you entered is correct.</li>
-  <li><strong>Port</strong>: Unless otherwise instructed to do so by your
-    service provider or system administrator, leave this setting
-    unchanged.</li>
-  <li><strong>Connection security</strong>: Choose &quot;SSL/TLS&quot; if your
-    news server is configured to send and receive encrypted messages, or
-    &quot;None&quot; if it doesn&apos;t support it. If you are unsure, contact
-    your service provider or system administrator.</li>
-  <li><strong>Check for new messages at startup</strong>: Choose this setting
-    to automatically check for new messages when you first open the Mail &amp;
-    Newsgroup component of &brandShortName;.</li>
-  <li><strong>Check for new messages every [__] minutes</strong>: Choose this
-    setting to automatically check for new messages, and then specify the
-    number of minutes between mail checks. If you do not select this setting,
-    you can check for new messages at any time by clicking Get Msgs in the Mail
-    window.</li>
-  <li><strong>Ask me before downloading more than [__] messages</strong>:
-    Choose this setting to conserve disk space and download time, by setting a
-    limit for the number of messages you can retrieve at one time.</li>
-  <li><strong>Always request authentication when connecting to this
-    server</strong>: Some servers allow you to talk to them without logging in,
-    but will silently hide all the <em>private</em> groups/postings unless you
-    are logged in. Choose this setting to force &brandShortName; to
-    authenticate each time it connects to this server even when the server
-    doesn&apos;t ask (also called <q>Pushed Authentication</q>).</li>
-  <li><strong>newsrc file</strong>: The path to the newsrc file is mostly
-    displayed for your information. The newsrc file stores information about
-    the newsgroups to which you are subscribed and the messages you have read
-    in each newsgroup.</li>
-  <li><strong>Local directory</strong>: The location on your hard disk where
-    mail for this account is stored.</li>
-  <li><strong>Default Character Encoding</strong>: Click this drop-down list to
-    select the character encoding you want Mail &amp; Newsgroups to use as the
-    default for incoming newsgroup messages. This is recommended if it&apos;s
-    likely you might receive messages in which the character encoding (MIME
-    charset) is not indicated, such as when reading messages in international
-    newsgroups.</li>
-</ul>
-
-<p>[<a href="#mail_and_newsgroups_account_settings">Return to beginning of
-  section</a>]</p>
-
-<h2 id="copies_and_folders">Mail &amp; Newsgroups Account Settings - Copies
-  &amp; Folders</h2>
-
-<p>This section describes the settings for sending automatic copies, and for
-  storing copies of outgoing messages, message drafts, and message
-  templates.</p>
-
-<p>By default, &brandShortName; Mail &amp; Newsgroups stores copies of your
-  outgoing messages in the Sent folder for the current account.
-  &brandShortName; Mail &amp; Newsgroups also stores message drafts in the
-  Drafts folder and message templates in the Templates folder for the
-  current account.</p>
-
-<p>If you are not already viewing the settings for Copies &amp; Folders, begin
-  from the Mail window:</p>
-
-<ol>
-  <li>Open the Edit menu and choose Mail &amp; Newsgroups Account Settings. You
-    see the Mail &amp; Newsgroups Account Settings dialog box.</li>
-  <li>Select the account, and click Copies &amp; Folders. You see the Copies
-    &amp; Folders panel.</li>
-</ol>
-
-<ul>
-  <li><strong>Place a copy in</strong>: Select where to store copies of your
-    outgoing mail and newsgroup messages. If you don&apos;t want to use the
-    default Sent folder for the current account, click Other and then choose
-    an account and then choose the folder for storing copies.</li>
-  <li><strong>Bcc these email addresses</strong>: Select whether you want to
-    always send a blind carbon copy (bcc) to another addressee, and enter the
-    address. If you want to always send a blind carbon copy to yourself, just
-    add your address to this list. Separate addresses with comma (,).</li>
-  <li><strong>Keep message drafts in</strong>: Select where to store message
-    drafts. If you don&apos;t want to use the default Drafts folder for the
-    current account, click Other and then choose another account and folder
-    for storing drafts.</li>
-  <li><strong>Keep message templates in</strong>: Select where to store
-    message templates. If you don&apos;t want to use the default Templates
-    folder for the current account, click Other and then choose another account
-    and folder for storing templates.</li>
-  <li><strong>Show confirmation dialog when messages are saved</strong>: Choose
-    this option if you want Mail &amp; Newsgroups to display a confirmation
-    dialog box when you save a draft message or a template. If checked, a
-    dialog box will appear when you save a draft or template to remind you
-    where &brandShortName; Mail &amp; Newsgroups is saving the draft or
-    template.</li>
-</ul>
-
-<p>[<a href="#mail_and_newsgroups_account_settings">Return to beginning of
-  section</a>]</p>
-
-<h2 id="addressing">Mail &amp; Newsgroups Account Settings - Composition &amp;
-  Addressing</h2>
-
-<p>You use Composition settings to choose how to format text, handle replies,
-  and how a signature you defined is included.</p>
-
-<p>If you are not already viewing the Composition settings, begin from the Mail
-  window:</p>
-
-<ol>
-  <li>Open the Edit menu and choose Mail &amp; Newsgroups Account Settings. You
-    see the Mail &amp; Newsgroups Account Settings dialog box.</li>
-  <li>Select the account and click the Composition &amp; Addressing
-    category.</li>
-</ol>
-
-<ul>
-  <li><strong>Compose messages in HTML format</strong>: Use the HTML editor as
-    the default editor for writing mail and newsgroup messages. Leave this item
-    unchecked to use the plain-text editor by default. HTML messages can
-    include formatted text, links, images, and tables, just like a web page.
-    However, some recipients may not be able to receive HTML messages.
-
-    <p><strong>Tip</strong>: If you only want to use an editor occasionally,
-      you can hold down the Shift key while clicking the Compose or the Reply
-      button to switch to the non-default on an as-needed basis.</p>
-  </li>
-  <li><strong>Automatically quote the original message when replying</strong>: 
-    Select this to include the original message text in your reply. Use the 
-    drop-down list to select if the cursor should be positioned below or above
-    the quoted text. You can also choose the quoting to be automatically
-    selected.
-    <ul>
-      <li><strong>and place my signature</strong>: This drop-down list lets you
-        choose where you want your signature to be placed. It&apos;s only
-        applicable if you decided to <a href="#account_settings">attach a
-        signature</a> and to place the cursor above the quoted text.</li>
-    </ul>
-  </li>
-</ul>
-
-<ul>
-  <li><strong>Include signature for replies</strong>: If you have created a
-    signature, select this option to include it in your reply to a message.
-    The signature is added according to your settings for quote and signature
-    placement.</li>
-  <li><strong>Include signature for forwards</strong>: If you have created a
-    signature, select this option to include it when you forward a message.
-    The signature is placed according to your reply settings when
-    <a href="#composition">forwarding inline</a>.</li>
-</ul>
-
-<p>You use Addressing settings to override the global LDAP server settings
-  specified for all <a href="#addressing_preferences">address books</a> in the
-  Preferences dialog box. LDAP server settings affect the behavior of
-  <a href="#address_autocompletion">address autocompletion</a>, and you can
-  change these settings for each account if necessary.</p>
-
-<p>Address autocompletion uses your address books to find matching entries when
-  you type email addresses in the addressing area of the Compose window.</p>
-
-<p>If you are not already viewing the Addressing settings, begin from the Mail
-  window:</p>
-
-<ol>
-  <li>Open the Edit menu and choose Mail &amp; Newsgroups Account Settings. You
-    see the Mail &amp; Newsgroups Account Settings dialog box.</li>
-  <li>Select the account and click the Composition &amp; Addressing
-    category.</li>
-</ol>
-
-<ul>
-  <li><strong>Automatically append my domain to addresses</strong>: Select
-    this if you want Mail &amp; Newsgroups to automatically complete
-    addresses you type with the domain from your account&apos;s address.</li>
-  <li><strong>Use my global LDAP server preferences for this account</strong>:
-    This is the default. Select this if you don&apos;t want to override the
-    global LDAP server preferences for this account.</li>
-  <li><strong>Use a different LDAP server</strong>: Select this option and then
-    choose another LDAP server from the list if you want to use a different
-    LDAP directory server for address autocompletion with this account. If
-    necessary, click Edit Directories to edit individual directory server
-    settings, add a directory server, or delete a directory server. For more
-    information, see <a href="#adding_and_removing_ldap_directories">Adding and
-    Removing LDAP Directories</a>.</li>
-</ul>
-
-<p>The directory you select will also 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>[<a href="#mail_and_newsgroups_account_settings">Return to beginning of
-  section</a>]</p>
-
-<h2 id="synchronization_and_storage">Mail &amp; Newsgroups Account Settings -
-  Synchronization &amp; Storage</h2>
-
-<p>Synchronization &amp; Storage settings let you conserve disk space or set
-  up an account so that you can use it while offline (disconnected from the
-  Internet). The settings available depend on the mail server type (IMAP, POP,
-  or News) associated with the account.</p>
-
-<div class="contentsBox">
-  <ul>
-    <li><a href="#synchronization_and_storage_settings_imap">Synchronization
-      &amp; Storage Settings (IMAP)</a></li>
-    <li><a href="#disk_space_settings_pop">Disk Space Settings (POP)</a></li>
-    <li><a href="#disk_space_settings_blogs">Disk Space Settings
-      (Blogs)</a></li>
-    <li><a href="#synchronization_and_storage_settings_nntp">Synchronization
-      &amp; Storage Settings (News)</a></li>
-    <li><a href="#retention_policy">Common Retention Policy Settings</a></li>
-  </ul>
-</div>
-
-<p>[<a href="#mail_and_newsgroups_account_settings">Return to beginning of
-  section</a>]</p>
-
-<h3 id="synchronization_and_storage_settings_imap">Synchronization &amp;
-  Storage Settings (IMAP)</h3>
-
-<p>If you are not already viewing the synchronization and storage preferences
-  for an IMAP account, begin from the Mail window:</p>
-
-<ol>
-  <li>Open the Edit menu and choose Mail &amp; Newsgroups Account Settings. You
-    see the Mail &amp; Newsgroups Account Settings dialog box.</li>
-  <li>Choose the Synchronization &amp; Storage category for an IMAP
-    account.</li>
-</ol>
-
-<ul>
-  <li><strong>Keep messages for this account on this computer</strong>: Select
-    this option so that messages in your folders will be available when you
-    are working offline. This setting also applies to any new folders
-    created or subscribed to.</li>
-  <li><strong>Advanced</strong>: Click to open a dialog to select the
-    folders that you want to make available for offline use. See
-    <a href="#selecting_items_for_offline_viewing">Selecting Items for Offline
-    Viewing</a> for more information.
-
-    <p><strong>Note</strong>: While the default setting can be overridden for
-      an individual folder, those per-folder settings are <em>removed</em>
-      whenever the <q>Keep messages for this account</q> box is toggled.</p>
-  </li>
-  <li><strong>Synchronize all messages locally regardless of age</strong>:
-    When synchronization is enabled for an account or a folder, <em>all</em>
-    messages are downloaded and local copies of them kept on disk, unless
-    a size limit is specified.</li>
-  <li><strong>Synchronize the most recent [__] [days]</strong>: Only copies of
-    messages younger than the specified number of days (weeks, months, years)
-    are kept locally for synchronization, after that they are removed from the
-    offline storage. This does <em>not</em> affect the originals on the server,
-    only the local copies are removed if the given age is reached.</li>
-  <li><strong>Don't download messages larger than [__] KB</strong>: Select this
-    option to conserve disk space by preventing large messages from being
-    downloaded. Enter the maximum size for downloaded messages. Changing
-    this option does <em>not</em> affect messages that have already been
-    downloaded.</li>
-  <li>The <a href="#retention_policy">retention settings</a> can be used to
-    free up space by deleting old messages. Note that these settings apply
-    to <em>both</em> local copies and their originals on the server.</li>
-</ul>
-
-<p>[<a href="#mail_and_newsgroups_account_settings">Return to beginning of
-  section</a>]</p>
-
-<h3 id="disk_space_settings_pop">Disk Space Settings (POP)</h3>
-
-<p>Messages from POP accounts are fully downloaded to your local machine unless
-  you have enabled the <q>Fetch headers only</q> setting. This section
-  describes how you can save disk space for a POP account. If your account has
-  the <q>Fetch headers only</q> setting enabled, then these Disk Space
-  preferences are ignored. If you are not already viewing the Disk Space
-  preferences for a POP account, follow these steps:</p>
-
-<p>Begin from the Mail window.</p>
-
-<ol>
-  <li>Open the Edit menu, choose Mail &amp; Newsgroups Account Settings. You
-    see the Mail &amp; Newsgroups Account Settings dialog box.</li>
-  <li>Click the Disk Space category for a POP account.</li>
-</ol>
-
-<ul>
-  <li><strong>Messages larger than [__] KB</strong>: Select this option to
-    conserve disk space by preventing large messages from being downloaded.
-    Enter the maximum size for downloaded messages.</li>
-  <li>The <a href="#retention_policy">retention settings</a> can be used to
-    free up space by deleting old messages. Note that these settings apply
-    to <em>both</em> local copies and their originals on the server.
-
-    <p><strong>Note</strong>: If your POP account is set up to use a Global
-      Inbox, the retention period settings of the target Inbox apply.</p>
-  </li>
-</ul>
-
-<p>[<a href="#mail_and_newsgroups_account_settings">Return to beginning of
-  section</a>]</p>
-
-<h3 id="disk_space_settings_blogs">Disk Space Settings (Blogs)</h3>
-
-<p>Messages from blogs &amp; news feeds accounts are only stored in your local
-  machine in their short form, ie. the article summary, regardless of whether
-  your settings are to show the full articles by default. Still, there are
-  options to control how much disk space is used by your blogs &amp; news feeds
-  account. If you are not already viewing the Disk Space preferences for a
-  blogs &amp; news feeds account, follow these steps:</p>
-
-<p>Begin from the Mail window.</p>
-
-<ol>
-  <li>Open the Edit menu, choose Mail &amp; Newsgroups Account Settings. You
-    see the Mail &amp; Newsgroups Account Settings dialog box.</li>
-  <li>Click the Disk Space category for a blogs &amp; news feeds account.</li>
-</ol>
-
-<p>There, you can specify which messages should be deleted to recover disk
-  space:</p>
-
-<ul>
-  <li><strong>Don&apos;t delete any messages</strong>: Select this option to
-    keep all messages forever. Keep in mind that, if you are subscribed to very
-    high-traffic blogs, this will increase the occupied disk space steadily and
-    could eventually fill up your hard disk.</li>
-  <li><strong>Delete all but the most recent [____] messages</strong>: Select this
-    option to keep in each feed only a maximum number of messages. Enter the
-    maximum number of messages (being 1,000 by default).</li>
-  <li><strong>Delete messages more than [__] days old</strong>: Select this
-    option to keep in each feed only messages that are not older than the number
-    of days you enter here (being 30 days by default).</li>
-  <li><strong>Always keep flagged messages</strong>: Check this option to
-    save (not delete) flagged messages, regardless of its age.</li>
-</ul>
-
-<p>[<a href="#mail_and_newsgroups_account_settings">Return to beginning of
-  section</a>]</p>
-
-<h3 id="synchronization_and_storage_settings_nntp">Synchronization &amp;
-  Storage Settings (News)</h3>
-
-<p>If you are not already viewing the offline and disk space settings for a
-  News account, begin from the Mail window:</p>
-
-<ol>
-  <li>Open the Edit menu, and choose Mail &amp; Newsgroups Account Settings.
-    You see the Mail &amp; Newsgroups Account Settings dialog box.</li>
-  <li>Choose the Synchronization &amp; Storage category for a News account.</li>
-</ol>
-
-<ul>
-  <li><strong>Select newsgroups for offline use</strong>: Click to select the
-    newsgroups that you want to make available for offline use. See
-    <a href="#selecting_items_for_offline_viewing">Selecting Items for Offline
-    Viewing</a> for more information.</li>
-</ul>
-
-<p>The following settings help to save disk space and download time. Specify
-  which messages you don&apos;t want to download locally:</p>
-
-<ul>
-  <li><strong>Read messages</strong>: Select this option to only download
-    message bodies from messages you haven&apos;t already read.</li>
-  <li><strong>Messages larger than [__] KB</strong>: Select this option to
-    conserve disk space by preventing large messages from being downloaded.
-    Enter the maximum size for downloaded messages.</li>
-  <li><strong>Messages more than [__] days old</strong>: Select this option to
-    only download messages that are not older than the number of days you enter
-    here.</li>
-</ul>
-
-<p>[<a href="#mail_and_newsgroups_account_settings">Return to beginning of
-  section</a>]</p>
-
-<h3 id="retention_policy">Common Retention Policy Settings</h3>
-
-<p>&brandShortName; can automatically delete old messages for you. You
-  can configure this process with the options listed below
-  <strong>To recover disk space, old messages can be permanently
-  deleted</strong>:</p>
-
-<ul>
-  <li><strong>Don't delete any messages</strong>: Keep all messages. Never
-    delete messages automatically based on their age.</li>
-  <li><strong>Delete all but the most recent [__] messages</strong>: Enter the
-    number of messages to keep. With this setting only messages older than these
-    messages are deleted.</li>
-  <li><strong>Delete messages more than [__] days old </strong>:
-    Keep all messages that arrived within the given number of days.</li>
-</ul>
-
-<p>With the following settings you can further constrain the three options to
-  delete messages automatically. This is especially useful in combination with
-  the option to keep all messages.</p> 
-
-<ul>
-  <li><strong>Always keep flagged messages</strong>: Use this option to deny
-    &brandShortName; to delete any messages you have flagged.</li>
-  <li><strong>Remove bodies from message more than [__] days old</strong>:
-    Select this option to retain all headers but to delete message bodies that
-    are older than the number of days you specify here (news accounts only).
-    Any option to delete the entire message based on age still applies.</li>
-</ul>
-
-<p>This policy can be overridden for an individual folder in the Folder
-  Properties, Retention Policy tab.</p>
-
-<p><strong>Note:</strong> If message synchronization is enabled (for IMAP), or
-  messages are left on the server (for POP accounts), the settings apply to
-  <em>both</em> local copies and their originals on the server.</p>
-
-<p>[<a href="#mail_and_newsgroups_account_settings">Return to beginning of
-  section</a>]</p>
-
-<h2 id="junk_settings">Mail &amp; Newsgroups Account Settings - Junk
-  Settings</h2>
-  
-<p>This section describes how to use the account junk settings. If
-  you are not currently viewing the Junk Settings, follow these steps:</p>
-
-<ol>
-  <li>Open the Edit menu, and choose Mail &amp; Newsgroups Account Settings.
-    You see the Mail &amp; Newsgroups Account Settings dialog box.</li>
-  <li>Click the Junk Settings category for your mail account.</li>
-</ol>
-
-<p>You use the Junk Settings panel to define your account-specific settings
-  for the adaptive mail filter. Global junk settings are changed under
-  <a href="#junk_and_suspect_preferences">Mail &amp; Newsgroups Preferences -
-  Junk &amp; Suspect Mail</a>.</p>
-  
-<ul>  
-  <li><strong>Enable adaptive junk mail controls for this account</strong>:
-    Toggle this option to activate or deactivate junk mail classification.</li>
-  <li><strong>Do not mark mail as junk if the sender is in [the address
-    book chosen from all your address books available in the drop down
-    box]</strong>:
-    Choose this option to prevent messages from people you know inadvertently
-    classified as junk mail.</li>
-  <li><strong>Trust junk mail headers set by [an external junk filter
-    like Spam Assassin or Spam Pal]</strong>: Choose this option if you want to
-    trust the junk classification of external filter programs.</li>
-  <li><strong>Move new junk messages to</strong>:
-    Check this option to automatically move messages flagged as Junk to a
-    special folder.
-    <ul>
-      <li><strong><q>Junk</q> folder on [account]</strong>: Select this to use
-        the default Junk folder.</li>
-      <li><strong>Other: [account]</strong>: Select this to choose your own
-        custom-named junk folder.</li>
-      <li><strong>Automatically delete junk messages older than [__] days from
-        this folder</strong>: If you are confident old messages classified as
-        junk are indeed junk mail, check this option to automatically delete
-        old junk messages after a grace period.</li>
-    </ul>
-  </li>
-</ul>
-
-<p>[<a href="#mail_and_newsgroups_account_settings">Return to beginning of
-  section</a>]</p>
-
-<h2 id="return_receipts">Mail &amp; Newsgroups Account Settings - Return
-  Receipts</h2>
-
-<p>This section describes how to use the Return Receipts account settings. If
-  you are not currently viewing the Return Receipts settings, follow these
-  steps:</p>
-
-<ol>
-  <li>Open the Edit menu, and choose Mail &amp; Newsgroups Account Settings.
-    You see the Mail &amp; Newsgroups Account Settings dialog box.</li>
-  <li>Click the Return Receipts category for your mail account.</li>
-</ol>
-
-<p>You use the Return Receipts settings to define return receipt settings for
-  outgoing messages from this mail account. You also use the Return Receipt
-  settings to specify how to manage requests you receive for return receipts.
-  These settings override global return receipt preferences you specified using
-  <a href="#return_receipts_preferences">Mail &amp; Newsgroups Preferences -
-  Return Receipts</a>.</p>
-
-<ul>
-  <li><strong>Use my global return receipt preferences for this
-    account</strong>: By default, this account uses the return receipt
-    preferences specified by <a href="#return_receipts_preferences">Mail &amp;
-    Newsgroups Preferences - Return Receipts</a>.</li>
-  <li><strong>Customize return receipts for this account</strong>: Lets you
-    change the return receipt preferences for this account.
-    <ul>
-      <li><strong>When sending messages, always request a return
-        receipt</strong>: Enables automatic return receipt requests for all
-        outgoing messages from this mail account.</li>
-      <li><strong>Leave it in my Inbox</strong>: Return receipt
-        confirmation messages are delivered to the Inbox for this account.
-
-        <p><strong>Tip</strong>: Choose this option if you want to use a
-          filter that automatically moves return receipt confirmation
-          messages to a folder you specify. For information on creating and
-          using filters, see <a href="#creating_message_filters">Creating
-          Message Filters</a>.</p>
-      </li>
-      <li><strong>Move it to my Sent Mail folder</strong>: Incoming return
-        receipt confirmation messages are moved to the Sent mail folder for
-        this account.</li>
-      <li><strong>Never send a return receipt</strong>: Choose this option if
-        you do not want to send a return receipt in response to requests for
-        return receipts from others.</li>
-      <li><strong>Allow return receipts for some messages</strong>: Choose how
-        you want to respond to requests you receive for return receipts.</li>
-    </ul>
-  </li>
-</ul>
-
-<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>
-
-<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
-    you want to configure.</li>
-</ol>
-
-<div class="contentsBox">In this section:
-  <ul>
-    <li><a href="#about_certificates">About Certificates</a></li>
-    <li><a href="#digital_signing">Digital Signing</a></li>
-    <li><a href="#encryption">Encryption</a></li>
-  </ul>
-</div>
-
-<h3 id="about_certificates">About Certificates</h3>
-
-<p>The main purpose of the Security panel in Mail &amp; Newsgroup Account
-  Settings is to select two certificates:</p>
-
-<ul>
-  <li>The email certificate you want to use for signing mail messages you send
-    to other people.</li>
-  <li>The email certificate you want other people to use when they encrypt
-    messages they send to you.</li>
-</ul>
-
-<p>Depending on the policies of the
-  <a href="glossary.xhtml#certificate_authority">certificate authority (CA)</a>
-  that issues your certificate(s), you can use one certificate for both
-  purposes or two different certificates. Even if you use just one, you must
-  specify it twice, once for digital signing and once for encryption.</p>
-
-<p>The certificates you select here are included with every signed message you
-  send. These certificates allow your recipients to verify your digital
-  signature and to encrypt messages that they send to you.</p>
-
-<h3 id="digital_signing">Digital Signing</h3>
-
-<p>You use the Digital Signing area in the <a href="#security">Security
-  panel</a> to specify how you want to sign your email messages:</p>
-
-<ul>
-  <li><strong>Use this certificate to digitally sign messages you
-    send</strong>: If this field is empty or if it displays the wrong
-    certificate, click Select to choose from the certificates you have on
-    file.</li>
-  <li><strong>Digitally sign messages</strong>: Select this checkbox if you
-    want to digitally sign all the messages you send. (A personal certificate
-    must be specified below before you can select this checkbox.)</li>
-</ul>
-
-<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
-  &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>
-
-<ul>
-  <li><strong>Use this certificate to encrypt &amp; decrypt messages sent to
-    you</strong>: If this field is empty or if it displays the wrong
-    certificate, click Select to choose from the certificates you have on
-    file.</li>
-  <li><strong>Never</strong>: Select this option if you never want to use
-    encryption, or only occasionally.</li>
-  <li><strong>Required</strong>: Select this option if you always want to use
-    encryption. If you don&apos;t have all the necessary certificates, the
-    message won&apos;t be sent unless you explicitly turn off encryption for
-    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
-  &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>
-
-<p>Local Folders is the account where &brandShortName; Mail &amp; Newsgroups
-  saves any messages that you send while working offline. Messages you send
-  while working offline are saved in the Unsent Messages folder under Local
-  Folders. Any folders you create under the Local Folders account reside on
-  your hard disk, so Local Folders is a good place to save messages that you
-  want to keep.</p>
-
-<p>If you are not already viewing the Local Folders settings, begin from the
-  Mail window:</p>
-
-<ol>
-  <li>Open the Edit menu and choose Mail &amp; Newsgroups Account Settings. You
-    see the Mail &amp; Newsgroups Account Settings dialog box.</li>
-  <li>Select the Local Folders category.</li>
-</ol>
-
-<ul>
-  <li><strong>Account Name</strong>: The name associated with the Local Folders
-    account.</li>
-  <li><strong>Local directory</strong>: The location on your hard disk where
-    mail for this account is stored.</li>
-</ul>
-
-<p>[<a href="#mail_and_newsgroups_account_settings">Return to beginning
-  of section</a>]</p>
-
-<h2 id="outgoing_server">Mail &amp; Newsgroups Account Settings - Outgoing
-  Server (SMTP)</h2>
-
-<p>The outgoing server will transport your outgoing mail to the intended
-  recipients.</p>
-
-<p>If you are not already viewing the Outgoing Server (SMTP) settings, begin
-  from the Mail window:</p>
-
-<ol>
-  <li>Click on any Mail window.</li>
-  <li>From the Edit menu, choose Mail &amp; Newsgroup Account Settings.</li>
-  <li>Select Outgoing Server (SMTP) and either edit an existing server or
-      add a new one. If you are not sure which option to choose, check with
-      your ISP or system administrator)<br/>
-      You can choose from these servers via the Outgoing Server dropdown in
-      the <a href="#account_settings">Identity Settings</a>.</li>
-</ol>
-
-<ul>
-  <li><strong>Description</strong>: A short freetext description of that server
-    configuration. This will show up as first part in the server list.</li>
-  <li><strong>Server name</strong>: The SMTP server that will deliver your
-    outgoing mail. To use a different SMTP server, change this field.</li>
-  <li><strong>Port</strong>: The port on which the SMTP server will be
-    connected. By default it holds the standard port for the specified
-    encryption. Change it if the mail server is listening for connections
-    on a non-standard port.</li>
-  <li><strong>Use name and password</strong>: If your SMTP server requires
-    authentication to send mail, select this option and enter your user name.
-    The first time you send mail, you will be prompted for your password. At
-    that time you can instruct &brandShortName; to save your password for
-    future sessions.</li>
-  <li><strong>Use secure authentication</strong>: Choose this setting if you
-    want to use secure mechanisms for logging in like CRAM-MD5. If you are
-    unsure if your service supports this, contact your service provider or
-    system administrator.</li>
-  <li><strong>Use secure connection</strong>: There are two methods for
-    establishing a <a href="glossary.xhtml#secure_connection">secure
-    connection</a> to your outgoing server. Pick the one your server supports
-    (if you make a choice for which your server is not configured, you will
-    get an error message when sending mail).
-    <ul>
-      <li><strong>STARTTLS, if available</strong>: &brandShortName; will try to
-        negotiate encryption using the
-        <a href="glossary.xhtml#starttls">STARTTLS</a> method. If the server
-        doesn&apos;t support it, an unencrypted connection is used.</li>
-      <li><strong>STARTTLS</strong>: Require an encrypted connection, use the
-        <a href="glossary.xhtml#starttls">STARTTLS</a> method. This mechanism
-        will usually run on the standard SMTP port 25.</li>
-      <li><strong>SSL/TLS</strong>: Require an encrypted connection, use the
-        SMTP-over-SSL (also known as SMTPS) method. The default port for this
-        is 465.</li>
-    </ul>
-  </li>
-</ul>
-
-<p>[<a href="#mail_and_newsgroups_account_settings">Return to beginning of
-  section</a>]</p>
-
-<h1 id="mail_and_newsgroup_preferences">Mail &amp; Newsgroup Preferences</h1>
-
-<p>The sections listed below describe the Mail &amp; Newsgroups preferences
-  that apply to all your mail and newsgroup accounts. To see these
-  preferences:</p>
-
-<ol>
-  <li>Open the <span class="mac">&brandShortName;</span>
-    <span class="noMac">Edit</span> menu and choose Preferences.</li>
-  <li>Double-click Mail &amp; Newsgroups to expand the list.</li>
-</ol>
-
-<div class="contentsBox">In this section:
-  <ul>
-    <li><a href="#mail_and_newsgroups">Mail &amp; Newsgroups</a></li>
-    <li><a href="#message_display">Message Display</a></li>
-    <li><a href="#notifications">Notifications</a></li>
-    <li><a href="#composition">Composition</a></li>
-    <li><a href="#send_format">Send Format</a></li>
-    <li><a href="#addressing_preferences">Addressing</a></li>
-    <li><a href="#junk_and_suspect_preferences">Junk &amp; Suspect Mail</a></li>
-    <li><a href="#tags">Tags</a></li>
-    <li><a href="#return_receipts_preferences">Return Receipts</a></li>
-    <li><a href="#character_encoding">Character Encoding</a></li>
-    <li><a href="#network_and_storage_preferences">Network &amp; Storage
-      Preferences</a></li>
-  </ul>
-</div>
-
-<h2 id="mail_and_newsgroups">Mail &amp; Newsgroups Preferences - Mail &amp;
-  Newsgroups</h2>
-
-<p>This section describes the main Mail &amp; Newsgroups preferences. If you
-  are not already viewing the Mail &amp; Newsgroups main preferences, follow
-  these steps:</p>
-
-<ol>
-  <li>Open the <span class="mac">&brandShortName;</span>
-    <span class="noMac">Edit</span> menu and choose Preferences. You see the
-    Preferences dialog box.</li>
-  <li>Click the Mail &amp; Newsgroups category.</li>
-</ol>
-
-<ul>
-  <li><strong>Confirm when moving folders to the Trash</strong>: Choose to
-    allow Mail &amp; Newsgroups to prompt you before deleting folders.</li>
-  <li class="win"><strong>Use &brandShortName; Mail as the default mail
-    application</strong>: Select &brandShortName; Mail &amp; Newsgroups as the
-    default mail application for Windows and from within other applications
-    such as Microsoft Word.
-
-    <p><strong>Note</strong>: Setting &brandShortName; Mail &amp; Newsgroups as
-      the default mail application may disable another mail application. To
-      restore the other mail application as the default, deselect this
-      option.</p>
-  </li>
-  <li><strong>Remember the last selected message</strong>: Choose this option
-    if you want &brandShortName; to select the message you had selected last
-    before leaving a folder when you reenter a folder.</li>
-  <li><strong>Preserve threading when sorting messages</strong>: Select this
-    option if you want &brandShortName; to preserve the threaded message
-    grouping <a href="#sorting_and_threading_messages">when sorting
-    messages</a>. If it is not selected, &brandShortName; automatically
-    displays the messages unthreaded when you sort them by clicking on the
-    column headers.</li>
-  <li><strong>When Mail launches, show the Start Page in the message
-    area</strong>: Select this to enable the Start Page. The Start Page
-    appears in the message area when you first open &brandShortName; Mail &amp;
-    Newsgroups. This page is the default page, but you can enter a different
-    web page or URL of your choice. To disable the Start Page, deselect this
-    option. Click Restore Default to return to the original page provided by
-    &brandShortName;.</li>
-</ul>
-
-<p>[<a href="#mail_and_newsgroup_preferences">Return to beginning of
-  section</a>]</p>
-
-<h2 id="message_display">Mail &amp; Newsgroups Preferences - Message
-  Display</h2>
-
-<p>Message Display preferences allow you to choose how messages are
-  displayed (for example, font style and color) in all accounts. If you are not
-  already viewing the Message Display settings, follow these steps:</p>
-
-<ol>
-  <li>Open the <span class="mac">&brandShortName;</span>
-    <span class="noMac">Edit</span> menu and choose Preferences. You see the
-    Preferences dialog box.</li>
-  <li>Under the Mail &amp; Newsgroups category, click Message Display. (If no
-    subcategories are visible, double-click Mail &amp; Newsgroups to expand
-    the list.)</li>
-</ol>
-
-<ul>
-  <li><strong>When opening messages, display them in</strong>: Here you can
-    choose if you want to reuse a message window for the next mail or if you
-    want to open a new one for each.</li>
-  <li><strong>Block images and other content from remote sources</strong>:
-    Select this checkbox if you do not want to display remote images and other
-    content in received messages, except from senders in your address books
-    whom you have allowed. (This checkbox is selected by default.)</li>
-  <li><strong>Wait [__] seconds before marking a message as read</strong>:
-    Choose this option if you do not want a message to be marked as read when
-    you are only taking a brief look at it. Enter the number of seconds you
-    want a message to be displayed before it gets marked as read automatically.
-
-    <p><strong>Tip</strong>: If you do not want Mail &amp; Newsgroups to mark
-      your messages as read automatically at all, you can select this option
-      and enter a very large number of seconds.</p>
-  </li>
-  <li><strong>Plain Text Messages</strong>: Select the font you prefer for
-    viewing plain-text messages: fixed width or variable width. Choosing a font
-    style, size, and color for quoted plain-text messages can help you more
-    easily distinguish quoted text (usually a message that&apos;s been
-    forwarded to you or by you).
-    <ul>
-      <li><strong>Wrap text to fit window width</strong>: Select this so that
-        incoming messages are word-wrapped to fit the width of your Mail
-        window.</li>
-      <li><strong>Display emoticons as graphics</strong>: Select this so that
-        when you receive messages that contain emoticons (also called smiley
-        faces) Mail &amp; Newsgroups can convert them to graphics, for example:
-        <table border="1">
-          <tr align="center">
-            <td><strong>This</strong>:</td>
-            <td><strong>Converts to</strong>:</td>
-          </tr>
-          <tr align="center">
-            <td>:-)</td>
-            <td><span class="smiley moz-smiley-s1"/></td>
-          </tr>
-          <tr align="center">
-            <td>:)</td>
-            <td><span class="smiley moz-smiley-s1"/></td>
-          </tr>
-          <tr align="center">
-            <td>:-(</td>
-            <td><span class="smiley moz-smiley-s2"/></td>
-          </tr>
-          <tr align="center">
-            <td>:(</td>
-            <td><span class="smiley moz-smiley-s2"/></td>
-          </tr>
-          <tr align="center">
-            <td>;-)</td>
-            <td><span class="smiley moz-smiley-s3"/></td>
-          </tr>
-          <tr align="center">
-            <td>;-p</td>
-            <td><span class="smiley moz-smiley-s4"/></td>
-          </tr>
-        </table>
-      </li>
-    </ul>
-  </li>
-</ul>
-
-<p>[<a href="#mail_and_newsgroup_preferences">Return to beginning of
-  section</a>]</p>
-
-<h2 id="notifications">Mail &amp; Newsgroups Preferences - Notifications</h2>
-
-<p>Notification preferences allow you to select different methods for informing
-  you on arrival of a new message. So you don&apos;t have to always look in the
-  folders.</p>
-
-<ol>
-  <li>Open the <span class="mac">&brandShortName;</span>
-    <span class="noMac">Edit</span> menu and choose Preferences.</li>
-  <li>Under the Mail &amp; Newsgroups category, click Notifications. (If no
-    subcategories are visible, double-click Mail &amp; Newsgroups to expand
-    the list.)</li>
-</ol>
-
-<ul>
-  <li class="win"><strong>Show an alert</strong>: Select this if you want 
-    &brandShortName; Mail &amp; Newsgroups to display a sliding alert above 
-    your system tray in the lower right corner of your screen when new 
-    messages arrive. The sliding alert only appears once when new messages
-    arrive, and won&apos;t appear again until you bring the Mail &amp;
-    Newsgroups window to the front.
-    <table>
-      <tr>
-        <td colspan="2"><img src="images/mail_newmail_alert.png" alt=""/></td>
-      </tr>
-      <tr>
-        <td style="width: 20px;"></td>
-        <td><strong>Sliding new mail alert</strong></td>
-      </tr>
-    </table>
-
-    <p>When the alert appears, clicking the link displayed in the alert will
-      take you to the first folder that has new mail.
-    </p>
-
-    <p>The new message alert will continue to work even after you close the
-      Mail window (as long as another &brandShortName; application is running).
-    </p>
-  </li>
-
-  <li class="win"><strong>Show a tray icon</strong>: Select this if you want
-    &brandShortName; Mail &amp; Newsgroups to display an icon in your system
-    tray (which is usually found in the lower right corner of your screen) when
-    new messages arrive. This icon will stay in the system tray until you have
-    visited one of your folders with new mail or checked for new messages
-    manually.
-    <p style="text-indent: 20px"><img src="images/mail_newmail_trayicon.png"
-      alt=""/>&nbsp;&nbsp;<strong>New mail tray icon</strong></p>
-    <p>When the icon appears, double-clicking it will open the &brandShortName;
-      Mail &amp; Newsgroups main window.</p>
-  </li>
-
-  <li class="mac"><strong>Animate the Dock icon</strong>: Select this if you
-    want Mail &amp; Newsgroups to bounce the &brandShortName; Dock icon when
-    new messages arrive.</li>
-  <li><strong>Play a sound</strong>: Select this if you want &brandShortName; 
-    Mail &amp; Newsgroups to play a sound when new messages arrive. You can
-    choose between the default system sound and a custom sound in WAV format.
-    If you choose the latter, use the Browse button to select the sound file in
-    the file locator. Click on the Preview button to listen to the chosen sound
-    file.
-
-    <p>Once &brandShortName; Mail has been started, the new messages sound will
-      continue to work even after you close the Mail window (as long as another
-      &brandShortName; application is running).</p>
-  </li>
-</ul>
-
-<p>[<a href="#mail_and_newsgroup_preferences">Return to beginning of
-  section</a>]</p>
-
-<h2 id="composition">Mail &amp; Newsgroups Preferences - Composition</h2>
-
-<p>Composition preferences affect how you create messages (for example,
-  forwarding options and address autocompletion) in all accounts. If you are
-  not already viewing the Composition settings, 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 Mail &amp; Newsgroups category, click Composition. (If no
-    subcategories are visible, double-click Mail &amp; Newsgroups to expand
-    the list.)</li>
-</ol>
-
-<ul>
-  <li><strong>Forward Messages</strong>: Choose how you want forwarded
-    message text to appear: as an attachment or inline (in the body of your
-    message).</li>
-  <li><strong>Quote attachments viewed inline in replies</strong>: If this
-    option is checked, then attachments (such as images, text, or messages)
-    viewed inline are included in the quote when replying to an email.</li>
-  <li><strong>Automatically save the message every [__] minutes</strong>:
-    Choose this option if you want Mail &amp; Newsgroups to save the message
-    you are currently composing automatically at the given interval. After a
-    computer crash or program failure you can find the latest saved version of
-    the message in your Drafts folder.</li>
-  <li><strong>Confirm when using keyboard shortcut to send message</strong>:
-    Check this option if want to be asked if you&apos;re sure to be ready to
-    send the message when you&apos;re pressing Ctrl+Return in message editor.
-    This may help you avoid accidentally sending the message if you enter the
-    keyboard shortcut by mistake when composing a message.</li>
-  <li><strong>Wrap plain text messages at [__] characters</strong>: Enter a
-    number to set the right margin for text in the message area.</li>
-  <li><strong>Check spelling before sending</strong>: Select this option to
-    have Mail &amp; Newsgroups always check the spelling of your message before
-    you send it.</li>
-  <li><strong>Check spelling as you type</strong>: Select this option to have
-    Mail &amp; Newsgroups always check the spelling of your message as you type
-    it.</li>
-  <li><strong>Language</strong>: Use the drop-down list to select the language
-    you want to use to check the spelling in your messages or to download more
-    dictionaries.</li>
-  <li><strong>Defaults for HTML Messages</strong>: Here you can define what the
-    defaults are for font, size, text and background color if you choose to
-    send mails in HTML format.</li>
-</ul>
-
-<p>[<a href="#mail_and_newsgroup_preferences">Return to beginning of
-  section</a>]</p>
-
-<h2 id="send_format">Mail &amp; Newsgroups Preferences - Send Format</h2>
-
-<p>Send Format preferences allow you to specify how you want to format your
-  outgoing messages. If you are not already viewing the Send Format settings,
-  follow these steps:</p>
-
-<ol>
-  <li>Open the <span class="mac">&brandShortName;</span>
-    <span class="noMac">Edit</span> menu and choose Preferences. You see the
-    Preferences dialog box.</li>
-  <li>Under the Mail &amp; Newsgroups category, click Send Format. (If no
-    subcategories are visible, double-click Mail &amp; Newsgroups to expand
-    the list.)</li>
-</ol>
-
-<ul>
-  <li><strong>Ask me what to do</strong>: This option requires Mail &amp;
-    Newsgroups to prompt you to choose a format before you send the
-    message.</li>
-  <li><strong>Convert the message to plain text</strong>: This option may
-    cause your message to lose formatting such as bold text.</li>
-  <li><strong>Send the message in HTML anyway</strong>: If you select this
-    option, keep in mind that some mail programs may have trouble displaying
-    the message.</li>
-  <li><strong>Send the message in both plain text and HTML</strong>: This
-    option uses more disk space.
-
-    <p>You can always override these preferences for an individual message by
-      using the Options menu in the Mail Compose window.</p>
-  </li>
-  <li><strong>HTML and Plain Text Domains</strong>: Use the Add button to add
-    the domain names that you typically send mail to, if you know which domains
-    can display HTML-formatted mail messages, and which domains can only
-    display plain text.</li>
-</ul>
-
-<p>For example, if you typically send mail to multiple recipients that have the
-  same domain name (for example, your colleagues all have email addresses that
-  end in <q>netscape.net</q>), and you know that this domain name is capable of
-  displaying HTML messages, then you can add the netscape.net domain to the
-  list of HTML Domains so that Mail &amp; Newsgroups will automatically send
-  messages in HTML format to these recipients.</p>
-
-<p>Similarly, if you typically send mail to recipients at a domain that you
-  know can only receive Plain Text messages, you can add that domain name to
-  the list of Plain Text domains, so that Mail &amp; Newsgroups automatically
-  sends messages to that domain in plain-text format.</p>
-
-<p><strong>Note</strong>: If you regularly compose HTML (formatted) mail
-  messages, keep in mind that sometimes not all recipients use mail programs
-  that can display HTML formatting properly. Send Format preferences allow you
-  to specify how you want to format messages that go to recipients who cannot
-  display HTML-formatted mail. You can convert messages to plain text, format
-  them only as HTML, or format them as both HTML and plain text. These
-  preferences apply to all your mail accounts, but only to mail messages and
-  not to newsgroup messages.</p>
-
-<p>Whenever you add a person or address card to your address book, you can
-  specify whether that addressee can receive HTML-formatted messages. However,
-  when this information is unknown, you can set Send Format preferences for how
-  Mail &amp; Newsgroups formats these messages.</p>
-
-<p>[<a href="#mail_and_newsgroup_preferences">Return to beginning of
-  section</a>]</p>
-
-<h2 id="addressing_preferences">Mail &amp; Newsgroups Preferences -
-  Addressing</h2>
-
-<p>Addressing preferences allow you to control the settings for
-  &brandShortName; Mail &amp; Newsgroups address books (for example, email
-  address collection and address autocompletion). If you are not already
-  viewing the Addressing settings, follow these steps:</p>
-
-<ol>
-  <li>Open the <span class="mac">&brandShortName;</span>
-    <span class="noMac">Edit</span> menu and choose Preferences. You see the
-    Preferences dialog box.</li>
-  <li>Under the Mail &amp; Newsgroups category, select Addressing. (If no
-    subcategories are visible, double-click Mail &amp; Newsgroups to expand
-    the list.)</li>
-</ol>
-
-<ul>
-  <li><strong>Email Address Collection</strong>: Select this if you want Mail
-    &amp; Newsgroups to automatically collect recipients&apos; email addresses.
-    Use the drop-down list to choose between having the addresses added to your
-    Collected Addresses or your Personal Address Book.</li>
-  <li id="address_autocompletion"><strong>Address Autocompletion</strong>:
-    Address autocompletion allows you to quickly address mail without having to
-    search for names or type names completely. Select from which location Mail
-    &amp; Newsgroups will search for matching addresses: <q>Local Address
-    Books</q> (Personal Address Book, Collected Addresses, or any other local
-    address book) or <q>Directory Server</q> (an available LDAP directory
-    server) or both. If you want Mail &amp; Newsgroups to highlight addresses
-    that do not autocomplete, then select that option.
-
-    <p><strong>Note</strong>: If while addressing mail, multiple email address
-      matches are found, Mail &amp; Newsgroups displays a list of all possible
-      choices.</p>
-
-    <p>If you select Directory Server, choose a directory server from the list.
-      A directory server lets you look up addresses that are not stored in one
-      of your local address books. The directory you select will also 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>See <a href="#adding_and_removing_ldap_directories">Adding and Removing
-      LDAP Directories</a> for information on setting LDAP directory server
-      settings.</p>
-
-    <p><strong>Note</strong>: Directory server settings you enter from the
-      Preferences dialog box apply to all your mail accounts. You can override
-      these settings for individual accounts by specifying different LDAP
-      directory servers or server settings using the Addressing settings for an
-      account in the Mail &amp; Newsgroups Account Settings dialog box. To set
-      different addressing options for a specific account, open the Edit menu
-      and choose Mail &amp; Newsgroups Account Settings.</p>
-  </li>
-</ul>
-
-<p>[<a href="#mail_and_newsgroup_preferences">Return to beginning of
-  section</a>]</p>
-
-<h2 id="junk_and_suspect_preferences">Mail &amp; Newsgroups Preferences -
-  Junk &amp; Suspect Mail</h2>
-
-<p>This section describes how to use the Junk &amp; Suspect Mail preferences
-  panel. If you are not currently viewing the Junk &amp; Suspect Mail panel,
-  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 Mail &amp; Newsgroups category, select Junk &amp; Suspect Mail.
-    (If no subcategories are visible, double-click Mail &amp; Newsgroups to
-    expand the list.)</li>
-</ol>
-
-<ul>
-  <li><strong>When I mark messages as junk</strong>: Choose this to
-    set what you want &brandShortName; to do when you manually mark messages
-    as Junk.
-    <ul>
-      <li><strong>Move them to the account's <q>Junk</q> folder</strong>:
-        Choose this to move manually-marked Junk messages to the Junk folder.
-      </li>
-      <li><strong>Delete them</strong>: Choose this to move manually-marked 
-        Junk messages to the trash folder.</li>
-    </ul>
-  </li>
-  <li><strong>Mark messages as read</strong>:
-    <ul>
-      <li><strong>When &brandShortName; determines that they are junk</strong>:
-        Select this option to mark junk messages as read, so they will not show
-        up as new.</li>
-      <li><strong>When I manually mark them as junk</strong>: Select this
-        option to mark messages as read when you manually mark them as junk.
-      </li>
-    </ul>
-  </li>
-  <li><strong>Enable junk filter logging</strong>: Select this option to allow
-    logging the history of Junk mail detections. Click the <strong>Show log
-    </strong> button to open a dialog showing this log.</li>
-  <li><strong>Reset training data</strong>: Click this button to clear the
-    training data of the adaptive junk filter. Since this will effectively
-    destroy your personal junk profile, you will be asked for confirmation.
-  </li>
-  <li><strong>Tell me if the message I'm reading is a suspected email
-    scam</strong>: Choose this to make &brandShortName; analyze messages for
-    suspected email scams by looking for common techniques used to deceive
-    people.</li>
-  <li><strong>Allow anti-virus clients to scan incoming messages more
-    easily</strong>: Choose this to let &brandShortName; make it easier for
-    anti-virus software to analyze incoming mail messages for viruses before
-    they are stored locally.</li>
-</ul>
-
-<p>[<a href="#mail_and_newsgroup_preferences">Return to beginning of
-  section</a>]</p>
-
-
-<h2 id="tags">Mail &amp; Newsgroups Preferences - Tags</h2>
-
-<p>This section describes how to use the Tags preferences panel. You use the
-  Tags preferences to define the tag text, colors and order for message tags.
-  If you are not currently viewing the panel, 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 Mail &amp; Newsgroups category, select Tags. (If no options
-    are visible, double-click the Mail &amp; Newsgroups category to expand the
-    list.)</li>
-</ol>
-
-<ul>
-  <li><strong>Customize Tags</strong>: Specifies the tag text and the color
-    for each tag. You can edit or replace the default tag text with your
-    own text (up to 32 characters). To change the tag color, click the color
-    chip next to that tag and select a new color. Use the Move Up and Move Down
-    buttons to order your tags by descending importance. Messages with
-    multiple tags will be colored according to their most important tag.</li>
-  <li><strong>Restore Defaults</strong>: Removes all customized tags and
-    restores just the default tags&apos; text and colors.</li>
-</ul>
-
-<p>[<a href="#mail_and_newsgroup_preferences">Return to beginning of
-  section</a>]</p>
-
-<h2 id="return_receipts_preferences">Mail &amp; Newsgroups Preferences - Return
-  Receipts</h2>
-
-<p>This section describes how to use the Return Receipts preferences panel. If
-  you are not currently viewing the Return Receipts panel, 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 Mail &amp; Newsgroups category, select Return Receipts. (If no
-    subcategories are visible, double-click Mail &amp; Newsgroups to expand the
-    list.)</li>
-</ol>
-
-<p>You use the Return Receipts preferences to define return receipt settings
-  for outgoing messages from all your mail accounts. You also use the Return
-  Receipt preferences to specify how to manage requests you receive for return
-  receipts.</p>
-
-<ul>
-  <li><strong>When sending messages, always request a return receipt</strong>:
-    Enables automatic return receipt requests for all outgoing messages in all
-    your mail accounts.</li>
-  <li><strong>Leave it in my Inbox</strong>: Return receipt confirmation
-    messages are delivered to your Inbox.
-
-    <p><strong>Tip</strong>: Choose this option if you want to use a filter
-      that automatically moves return receipt confirmation messages to a folder
-      you specify. For information on creating and using filters, see
-      <a href="#creating_message_filters">Creating Message Filters</a>.</p>
-  </li>
-  <li><strong>Move it to my Sent Mail folder</strong>: Incoming return receipt
-    confirmation messages are moved to your Sent mail folder.</li>
-  <li><strong>Never send a return receipt</strong>: Choose this option if you
-    do not want to send a return receipt in response to requests for return
-    receipts from others.</li>
-  <li><strong>Allow return receipts for some messages</strong>: Choose how you
-    want to respond to requests you receive for return receipts.</li>
-</ul>
-
-<p>To override these global preferences for individual accounts, see
-  <a href="#return_receipts">Mail &amp; Newsgroups Account Settings - Return
-  Receipts</a>.</p>
-
-<p>[<a href="#mail_and_newsgroup_preferences">Return to beginning of
-  section</a>]</p>
-
-<h2 id="character_encoding">Mail &amp; Newsgroups Preferences - Character
-  Encoding</h2>
-
-<p>Character encoding preferences allow you to choose how messages are encoded
-  when being displayed or created in all accounts. If you are not already
-  viewing the Character Encoding settings, follow these steps:</p>
-
-<ol>
-  <li>Open the <span class="mac">&brandShortName;</span>
-    <span class="noMac">Edit</span> menu and choose Preferences. You see the
-    Preferences dialog box.</li>
-  <li>Under the Mail &amp; Newsgroups category, click Character Encoding. (If
-    no subcategories are visible, double-click Mail &amp; Newsgroups to expand
-    the list.)</li>
-</ol>
-
-<ul>
-  <li><strong>Default Character Encoding</strong>: Click this drop-down list to
-    select the character encoding you want Mail &amp; Newsgroups to use as the
-    default for incoming mail and newsgroup messages. This is recommended if
-    it&apos;s likely you might receive messages in which the character encoding
-    (MIME charset) is not indicated, such as when reading messages in
-    international newsgroups.</li>
-  <li><strong>Always use this default character encoding when messages are
-    displayed</strong>: Select this to apply the default character encoding to
-    all messages.
-
-    <p><strong>Tip</strong>: You can later view or change the character
-      encoding for a specific folder. In the Mail window, select a folder from
-      the list of Mail folders. Open the View menu, and choose Character
-      Encoding.</p>
-  </li>
-  <li><strong>For messages that contain 8-bit characters, use &apos;quoted
-    printable&apos; MIME encoding</strong>: Choose to have Mail &amp;
-    Newsgroups use <q>quoted printable</q> MIME encoding when sending regular
-    messages that use an 8-bit character encoding (for example, Latin
-    ISO-8859-3).</li>
-  <li><strong>Default Character Encoding</strong>: Select the character
-    encoding you want Mail &amp; Newsgroups to use as the default for outgoing
-    mail and newsgroup messages. Note that this character encoding is
-    <strong>not</strong> used when replying to a message. Instead, the
-    character encoding of the message being replied to is used by default.
-    Choose <strong>Always use this default character encoding in
-    replies</strong> to use the default character encoding for outgoing
-    messages even when replying.</li>
-</ul>
-
-<p>[<a href="#mail_and_newsgroup_preferences">Return to beginning of
-  section</a>]</p>
-
-<h2 id="network_and_storage_preferences">Mail &amp; Newsgroups Preferences -
-  Network &amp; Storage</h2>
-
-<p>This section describes how to use the Network &amp; Storage preferences
-  panel. If you are not currently viewing the panel, 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 Mail &amp; Newsgroups category, select Network &amp; Storage.
-    (If no subcategories are visible, double-click Mail &amp; Newsgroups to
-    expand the list.)</li>
-</ol>
-
-<p>The Network &amp; Storage preferences allow you to set preferences for
-  working offline, going online, mail connections and disk space.</p>
-
-<ul>
-  <li><strong>Offline</strong>: Select how you want Mail &amp; Newsgroups to
-    handle messages when going online or offline.</li>
-  <li><strong>Mail Connections</strong>: Choose how long you want Mail &amp;
-    Newsgroups to keep trying to contact the server before timing out.</li>
-  <li><strong>Disk Space</strong>: Select this to conserve disk space by 
-    automatically compacting message folders when it will save the amount 
-    of disk space you enter.</li>
-</ul>
-
-<p>See <a href="#working_offline">Working Offline</a> for information on
-  working offline.</p>
-
-<p>[<a href="#mail_and_newsgroup_preferences">Return to beginning of
-  section</a>]</p>
-
 </body>
 </html>
--- a/suite/chrome/common/help/mail_sec_help.xhtml
+++ b/suite/chrome/common/help/mail_sec_help.xhtml
@@ -55,17 +55,18 @@
   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="mail_help.xhtml#security">Configuring Your Security Settings</a>.
+    <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
@@ -139,21 +140,22 @@
   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="mail_help.xhtml#addressing_preferences">Mail &amp;
+  is controlled by
+  <a href="mailnews_preferences.xhtml#addressing_preferences">Mail &amp;
   Newsgroups Preferences - Addressing</a> or
-  <a href="mail_help.xhtml#addressing">Mail &amp; Newsgroups Account Settings -
-  Addressing</a>, which can be configured to look up recipients&apos; email
-  addresses in a directory.</p>
+  <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
@@ -237,19 +239,20 @@
   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="mail_help.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>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"
@@ -385,18 +388,18 @@
   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="mail_help.xhtml#security">Mail &amp; Newsgroups
-  Account Settings - Security</a></p>
+  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
--- a/suite/chrome/common/help/nav_help.xhtml
+++ b/suite/chrome/common/help/nav_help.xhtml
@@ -1174,17 +1174,17 @@ Súbor a kliknúť na položku Nastavenie tlače.</p>
             <a href="glossary.xhtml#xml">XML</a> a
             <a href="glossary.xhtml#xul">XUL</a>.</li>
         </ul>
       </li>
       <li><strong>Internetové protokoly</strong>:
         <ul>
           <li><a href="glossary.xhtml#http">HTTP</a>,
             <a href="glossary.xhtml#https">HTTPS</a>,
-            <a href="glossary.xhtml#ftp">FTP</a>, Chrome,
+            <a href="glossary.xhtml#ftp">FTP</a>, Chrome</li>
             <a href="glossary.xhtml#gopher">Gopher</a></li>
         </ul>
       </li>
     </ul>
 
     <h3 id="changing_default_browser_settings_automatically">Zmena predvolených nastavení prehliadača</h3>
 
     <p>Po ukončení inštalácie aplikácie &brandShortName; skontrolujte, či je predvoleným prehliadačom pre bežné internetové
--- a/suite/chrome/common/help/privacy_help.xhtml
+++ b/suite/chrome/common/help/privacy_help.xhtml
@@ -166,17 +166,17 @@
 <p>Povolenie týchto volieb je užitočné pri prehliadaní webu, avšak nemusí byť potrebné
   pri jednoduchých stránkach, ktoré prijmete prostredníctvom e-mailových správ.</p>
 
 <p>Ďalšie informácie o povolení resp. zakázaní cookies, obrázkov a
   zásuvných modulov v e-mailových správach nájdete v častiach:</p>
 
 <ul>
   <li><a href="using_priv_help.xhtml#cookies">Súkromie a bezpečnosť - Cookies</a></li>
-  <li><a href="mail_help.xhtml#message_display">Pošta a diskusné skupiny - zobrazenie
+  <li><a href="mailnews_preferences.xhtml#message_display">Pošta a diskusné skupiny - zobrazenie
     správy</a></li>
   <li><a href="cs_nav_prefs_advanced.xhtml#scripts_and_plugins">Rozšírené nastavenia
     - Skripty a zásuvné moduly</a></li>
 </ul>
 
 <p>[<a href="#privacy_on_the_internet">Návrat na začiatok kapitoly</a>]</p>
 
 <h2 id="how_can_i_make_sure_unauthorized_people_dont_use_information_about_me">Ako
--- a/suite/chrome/common/help/suite-toc.rdf
+++ b/suite/chrome/common/help/suite-toc.rdf
@@ -149,17 +149,17 @@
         <rdf:li> <rdf:Description ID="mail-doc-folders" nc:name="Organizing Your Messages" nc:link="mail_help.xhtml#organizing_your_messages" /> </rdf:li>
         <rdf:li> <rdf:Description ID="mail-junk" nc:name="Controlling Junk Mail" nc:link="mail_help.xhtml#controlling_junk_mail" /> </rdf:li>
         <rdf:li> <rdf:Description ID="mail-importing-other" nc:name="Importing Mail from Other Programs" nc:link="mail_help.xhtml#importing_mail_from_other_programs" /> </rdf:li>
         <rdf:li> <rdf:Description ID="mail-doc-news" nc:name="Getting Started With Newsgroups" nc:link="mail_help.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="mail_help.xhtml#getting_started_with_blogs_and_news_feeds" /> </rdf:li>
         <rdf:li> <rdf:Description ID="mail-doc-offline" nc:name="Working Offline" nc:link="mail_help.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="mail-doc-account-settings" nc:name="Mail &amp; Newsgroups Account Settings" nc:link="mail_help.xhtml#mail_and_newsgroups_account_settings" /> </rdf:li>
-        <rdf:li> <rdf:Description ID="mail-doc-mailprefs" nc:name="Mail &amp; Newsgroup Preferences" nc:link="mail_help.xhtml#mail_and_newsgroup_preferences" /> </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">
     <nc:subheadings>
       <rdf:Seq>
@@ -439,78 +439,78 @@
       </rdf:Seq>
     </nc:subheadings>
   </rdf:Description>
 
 
 <rdf:Description about="#mail-doc-account-settings">
     <nc:subheadings>
       <rdf:Seq>
-        <rdf:li> <rdf:Description ID="mail_account_identity" nc:name="Account Settings"  nc:link="mail_help.xhtml#account_settings"/> </rdf:li>
-        <rdf:li> <rdf:Description ID="mail-doc-choose" nc:name="Server Settings"  nc:link="mail_help.xhtml#server_settings"/> </rdf:li>
-        <rdf:li> <rdf:Description ID="mail_copies" nc:name="Copies &amp; Folders"  nc:link="mail_help.xhtml#copies_and_folders"/> </rdf:li>
-        <rdf:li> <rdf:Description ID="mail_addressing_settings" nc:name="Composition &amp; Addressing"  nc:link="mail_help.xhtml#addressing"/> </rdf:li>
-        <rdf:li> <rdf:Description ID="mail-doc-offline-space" nc:name="Synchronization &amp; Storage"  nc:link="mail_help.xhtml#synchronization_and_storage"/> </rdf:li>
-        <rdf:li> <rdf:Description ID="mail-account-receipts" nc:name="Return Receipts" nc:link="mail_help.xhtml#return_receipts"/> </rdf:li>
-        <rdf:li> <rdf:Description ID="mail-account-junk" nc:name="Junk Settings" nc:link="mail_help.xhtml#junk_settings"/> </rdf:li>
-        <rdf:li> <rdf:Description ID="mail_security_settings" nc:name="Security"  nc:link="mail_help.xhtml#security"/> </rdf:li>
-        <rdf:li> <rdf:Description ID="mail_local_folders_settings" nc:name="Local Folders"  nc:link="mail_help.xhtml#local_folders"/> </rdf:li>
-        <rdf:li> <rdf:Description ID="mail_smtp" nc:name="Outgoing Server (SMTP)"  nc:link="mail_help.xhtml#outgoing_server"/> </rdf:li>
+        <rdf:li> <rdf:Description ID="mail_account_identity" nc:name="Account Settings"  nc:link="mailnews_account_settings.xhtml#account_settings"/> </rdf:li>
+        <rdf:li> <rdf:Description ID="mail-doc-choose" nc:name="Server Settings"  nc:link="mailnews_account_settings.xhtml#server_settings"/> </rdf:li>
+        <rdf:li> <rdf:Description ID="mail_copies" nc:name="Copies &amp; Folders"  nc:link="mailnews_account_settings.xhtml#copies_and_folders"/> </rdf:li>
+        <rdf:li> <rdf:Description ID="mail_addressing_settings" nc:name="Composition &amp; Addressing"  nc:link="mailnews_account_settings.xhtml#addressing"/> </rdf:li>
+        <rdf:li> <rdf:Description ID="mail-doc-offline-space" nc:name="Synchronization &amp; Storage"  nc:link="mailnews_account_settings.xhtml#synchronization_and_storage"/> </rdf:li>
+        <rdf:li> <rdf:Description ID="mail-account-receipts" nc:name="Return Receipts" nc:link="mailnews_account_settings.xhtml#return_receipts"/> </rdf:li>
+        <rdf:li> <rdf:Description ID="mail-account-junk" nc:name="Junk Settings" nc:link="mailnews_account_settings.xhtml#junk_settings"/> </rdf:li>
+        <rdf:li> <rdf:Description ID="mail_security_settings" nc:name="Security"  nc:link="mailnews_account_settings.xhtml#security"/> </rdf:li>
+        <rdf:li> <rdf:Description ID="mail_local_folders_settings" nc:name="Local Folders"  nc:link="mailnews_account_settings.xhtml#local_folders"/> </rdf:li>
+        <rdf:li> <rdf:Description ID="mail_smtp" nc:name="Outgoing Server (SMTP)"  nc:link="mailnews_account_settings.xhtml#outgoing_server"/> </rdf:li>
       </rdf:Seq>
     </nc:subheadings>
   </rdf:Description>
 
 <rdf:Description about="#mail-doc-choose">
     <nc:subheadings>
       <rdf:Seq>
-        <rdf:li> <rdf:Description ID="mail-doc-choose-IMAP" nc:name="About IMAP"  nc:link="mail_help.xhtml#about_internet_message_access_protocol"/> </rdf:li>
-        <rdf:li> <rdf:Description ID="mail-doc-choose-POP" nc:name="About POP"  nc:link="mail_help.xhtml#about_post_office_protocol"/> </rdf:li>
-        <rdf:li> <rdf:Description ID="mail_server_imap" nc:name="IMAP Server Settings"  nc:link="mail_help.xhtml#imap_server_settings"/> </rdf:li>
-        <rdf:li> <rdf:Description ID="mail-doc-imap-advanced" nc:name="Advanced IMAP Server Settings"  nc:link="mail_help.xhtml#advanced_imap_server_settings"/> </rdf:li>
-        <rdf:li> <rdf:Description ID="mail_server_pop3" nc:name="POP Server Settings"  nc:link="mail_help.xhtml#pop_server_settings"/> </rdf:li>
-        <rdf:li> <rdf:Description ID="mail_server_nntp" nc:name="News Server Settings"  nc:link="mail_help.xhtml#news_server_settings"/> </rdf:li>
+        <rdf:li> <rdf:Description ID="mail-doc-choose-IMAP" nc:name="About IMAP"  nc:link="mailnews_account_settings.xhtml#about_internet_message_access_protocol"/> </rdf:li>
+        <rdf:li> <rdf:Description ID="mail-doc-choose-POP" nc:name="About POP"  nc:link="mailnews_account_settings.xhtml#about_post_office_protocol"/> </rdf:li>
+        <rdf:li> <rdf:Description ID="mail_server_imap" nc:name="IMAP Server Settings"  nc:link="mailnews_account_settings.xhtml#imap_server_settings"/> </rdf:li>
+        <rdf:li> <rdf:Description ID="mail-doc-imap-advanced" nc:name="Advanced IMAP Server Settings"  nc:link="mailnews_account_settings.xhtml#advanced_imap_server_settings"/> </rdf:li>
+        <rdf:li> <rdf:Description ID="mail_server_pop3" nc:name="POP Server Settings"  nc:link="mailnews_account_settings.xhtml#pop_server_settings"/> </rdf:li>
+        <rdf:li> <rdf:Description ID="mail_server_nntp" nc:name="News Server Settings"  nc:link="mailnews_account_settings.xhtml#news_server_settings"/> </rdf:li>
       </rdf:Seq>
     </nc:subheadings>
   </rdf:Description>
 
 <rdf:Description about="#mail-doc-offline-space">
     <nc:subheadings>
       <rdf:Seq>
-        <rdf:li> <rdf:Description ID="mail_offline_imap" nc:name="IMAP"  nc:link="mail_help.xhtml#synchronization_and_storage_settings_imap"/> </rdf:li>
-        <rdf:li> <rdf:Description ID="mail_offline_pop3" nc:name="POP"  nc:link="mail_help.xhtml#disk_space_settings_pop"/> </rdf:li>
-        <rdf:li> <rdf:Description ID="mail_offline_blogs" nc:name="Blogy"  nc:link="mail_help.xhtml#disk_space_settings_blogs"/> </rdf:li>
-        <rdf:li> <rdf:Description ID="mail_offline_nntp" nc:name="News"  nc:link="mail_help.xhtml#synchronization_and_storage_settings_nntp"/> </rdf:li>
+        <rdf:li> <rdf:Description ID="mail_offline_imap" nc:name="IMAP"  nc:link="mailnews_account_settings.xhtml#synchronization_and_storage_settings_imap"/> </rdf:li>
+        <rdf:li> <rdf:Description ID="mail_offline_pop3" nc:name="POP"  nc:link="mailnews_account_settings.xhtml#disk_space_settings_pop"/> </rdf:li>
+        <rdf:li> <rdf:Description ID="mail_offline_blogs" nc:name="Blogy"  nc:link="mailnews_account_settings.xhtml#disk_space_settings_blogs"/> </rdf:li>
+        <rdf:li> <rdf:Description ID="mail_offline_nntp" nc:name="News"  nc:link="mailnews_account_settings.xhtml#synchronization_and_storage_settings_nntp"/> </rdf:li>
       </rdf:Seq>
     </nc:subheadings>
   </rdf:Description>
 
 <rdf:Description about="#mail_security_settings">
     <nc:subheadings>
       <rdf:Seq>
-        <rdf:li> <rdf:Description ID="mail_security_settings_certs" nc:name="About Certificates"  nc:link="mail_help.xhtml#about_certificates"/> </rdf:li>
-        <rdf:li> <rdf:Description ID="mail_security_settings_sign" nc:name="Digital Signing"  nc:link="mail_help.xhtml#digital_signing"/> </rdf:li>
-        <rdf:li> <rdf:Description ID="mail_security_settings_encrypt" nc:name="Encryption"  nc:link="mail_help.xhtml#encryption"/> </rdf:li>
+        <rdf:li> <rdf:Description ID="mail_security_settings_certs" nc:name="About Certificates"  nc:link="mailnews_account_settings.xhtml#about_certificates"/> </rdf:li>
+        <rdf:li> <rdf:Description ID="mail_security_settings_sign" nc:name="Digital Signing"  nc:link="mailnews_account_settings.xhtml#digital_signing"/> </rdf:li>
+        <rdf:li> <rdf:Description ID="mail_security_settings_encrypt" nc:name="Encryption"  nc:link="mailnews_account_settings.xhtml#encryption"/> </rdf:li>
       </rdf:Seq>
     </nc:subheadings>
   </rdf:Description>
 
 <rdf:Description about="#mail-doc-mailprefs">
     <nc:subheadings>
       <rdf:Seq>
-        <rdf:li> <rdf:Description ID="mail_prefs_general" nc:name="Mail &amp; Newsgroups" nc:link="mail_help.xhtml#mail_and_newsgroups"/> </rdf:li>
-        <rdf:li> <rdf:Description ID="mail_prefs_display" nc:name="Message Display" nc:link="mail_help.xhtml#message_display"/> </rdf:li>
-        <rdf:li> <rdf:Description ID="mail_prefs_notifications" nc:name="Notifications" nc:link="mail_help.xhtml#notifications"/> </rdf:li>
-        <rdf:li> <rdf:Description ID="mail_prefs_messages" nc:name="Composition" nc:link="mail_help.xhtml#composition"/> </rdf:li>
-        <rdf:li> <rdf:Description ID="mail_prefs_formatting" nc:name="Send Format" nc:link="mail_help.xhtml#send_format"/> </rdf:li>
-        <rdf:li> <rdf:Description ID="mail_prefs_addressing" nc:name="Addressing" nc:link="mail_help.xhtml#addressing_preferences"/> </rdf:li>
-        <rdf:li> <rdf:Description ID="mail-prefs-junk" nc:name="Junk &amp; Suspect Mail" nc:link="mail_help.xhtml#junk_and_suspect_preferences"/> </rdf:li>
-        <rdf:li> <rdf:Description ID="mail-prefs-tags" nc:name="Tags" nc:link="mail_help.xhtml#tags"/> </rdf:li>
-        <rdf:li> <rdf:Description ID="mail-prefs-receipts" nc:name="Return Receipts" nc:link="mail_help.xhtml#return_receipts_preferences"/> </rdf:li>
-        <rdf:li> <rdf:Description ID="mail_prefs_character_encoding" nc:name="Character Encoding" nc:link="mail_help.xhtml#character_encoding"/> </rdf:li>
-        <rdf:li> <rdf:Description ID="mail_prefs_offline" nc:name="Sieť a úložisko" nc:link="mail_help.xhtml#network_and_storage_preferences"/> </rdf:li>
+        <rdf:li> <rdf:Description ID="mail_prefs_general" nc:name="Mail &amp; Newsgroups" nc:link="mailnews_preferences.xhtml#mail_and_newsgroups"/> </rdf:li>
+        <rdf:li> <rdf:Description ID="mail_prefs_display" nc:name="Message Display" nc:link="mailnews_preferences.xhtml#message_display"/> </rdf:li>
+        <rdf:li> <rdf:Description ID="mail_prefs_notifications" nc:name="Notifications" nc:link="mailnews_preferences.xhtml#notifications"/> </rdf:li>
+        <rdf:li> <rdf:Description ID="mail_prefs_messages" nc:name="Composition" nc:link="mailnews_preferences.xhtml#composition"/> </rdf:li>
+        <rdf:li> <rdf:Description ID="mail_prefs_formatting" nc:name="Send Format" nc:link="mailnews_preferences.xhtml#send_format"/> </rdf:li>
+        <rdf:li> <rdf:Description ID="mail_prefs_addressing" nc:name="Addressing" nc:link="mailnews_preferences.xhtml#addressing_preferences"/> </rdf:li>
+        <rdf:li> <rdf:Description ID="mail-prefs-junk" nc:name="Junk &amp; Suspect Mail" nc:link="mailnews_preferences.xhtml#junk_and_suspect_preferences"/> </rdf:li>
+        <rdf:li> <rdf:Description ID="mail-prefs-tags" nc:name="Tags" nc:link="mailnews_preferences.xhtml#tags"/> </rdf:li>
+        <rdf:li> <rdf:Description ID="mail-prefs-receipts" nc:name="Return Receipts" nc:link="mailnews_preferences.xhtml#return_receipts_preferences"/> </rdf:li>
+        <rdf:li> <rdf:Description ID="mail_prefs_character_encoding" nc:name="Character Encoding" nc:link="mailnews_preferences.xhtml#character_encoding"/> </rdf:li>
+        <rdf:li> <rdf:Description ID="mail_prefs_offline" nc:name="Sieť a úložisko" nc:link="mailnews_preferences.xhtml#network_and_storage_preferences"/> </rdf:li>
       </rdf:Seq>
     </nc:subheadings>
   </rdf:Description>
 
 <!-- COMPOSER HELP SECTION -->
 
 <rdf:Description about="#comp">
     <nc:subheadings>
--- a/suite/chrome/common/pref/pref-keynav.dtd
+++ b/suite/chrome/common/pref/pref-keynav.dtd
@@ -14,8 +14,11 @@
 <!ENTITY findAsYouTypeSound.accesskey "r">
 <!ENTITY findAsYouTypeEnableAuto.label "Hľadať automaticky pri písaní na webovej stránke:">
 <!ENTITY findAsYouTypeEnableAuto.accesskey "H">
 <!ENTITY findAsYouTypeAutoText.label "V ľubovoľnom texte na stránke">
 <!ENTITY findAsYouTypeAutoText.accesskey "u">
 <!ENTITY findAsYouTypeAutoLinks.label "Len v odkazoch">
 <!ENTITY findAsYouTypeAutoLinks.accesskey "L">
 
+<!ENTITY findAsYouTypeFindbarEnable.label "Zobraziť vyhľadávací panel v režime Hľadať počas písania">
+<!ENTITY findAsYouTypeFindbarEnable.accesskey "Z">
+<!ENTITY findAsYouTypeFindbarEnableTip.label "Poznámka: v režime Hľadať počas písania bez zobrazeného vyhľadávacieho panela nie je možné zadávať medzinárodné znaky.">
--- a/suite/chrome/common/pref/pref-proxies-advanced.dtd
+++ b/suite/chrome/common/pref/pref-proxies-advanced.dtd
@@ -3,25 +3,22 @@
 <!ENTITY  protocols.caption           "Servery proxy pre jednotlivé protokoly">
 <!ENTITY  protocols.description       "Štandardne je používaný jeden server proxy pre všetky protokoly.">
 <!ENTITY  http.label                  "Server proxy HTTP:">
 <!ENTITY  http.accesskey              "H">
 <!ENTITY  ssl.label                   "Server proxy SSL:">
 <!ENTITY  ssl.accesskey               "S">
 <!ENTITY  ftp.label                   "Server proxy pre FTP:">
 <!ENTITY  ftp.accesskey               "F">
-<!ENTITY  gopher.label                "Server proxy pre Gopher:">
-<!ENTITY  gopher.accesskey            "G">
 <!ENTITY  reuseProxy.label            "Použiť tento server proxy pre všetky protokoly">
 <!ENTITY  reuseProxy.accesskey        "x">
 <!ENTITY  port.label                  "Port:">
 <!ENTITY  HTTPPort.accesskey          "o">
 <!ENTITY  SSLPort.accesskey           "r">
 <!ENTITY  FTPPort.accesskey           "t">
-<!ENTITY  gopherPort.accesskey        "">
 
 <!ENTITY  socks.caption               "Všeobecný server proxy">
 <!ENTITY  socks.description           "SOCKS je všeobecný server proxy používaný vo firemnom alebo podobných prostrediach.">
 <!ENTITY  socks.label                 "Server SOCKS:">
 <!ENTITY  socks.accesskey             "C">
 <!ENTITY  socks4.label                "SOCKS v4">
 <!ENTITY  socks4.accesskey            "K">
 <!ENTITY  socks5.label                "SOCKS v5">
--- a/suite/chrome/mailnews/addressbook/abMainWindow.dtd
+++ b/suite/chrome/mailnews/addressbook/abMainWindow.dtd
@@ -112,16 +112,17 @@
 <!ENTITY editItemButton.accesskey                       "l">
 <!ENTITY newmsgButton.label                             "Nová správa">
 <!ENTITY newmsgButton.accesskey                         "N">
 <!ENTITY deleteItemButton.label                         "Odstrániť">
 <!ENTITY deleteItemButton.accesskey                     "d">
 <!ENTITY newimButton.label                              "Rýchla správa">
 <!ENTITY newimButton.accesskey                          "R">
 <!ENTITY searchNameAndEmail.placeholder                 "Hľadať meno alebo e-mail">
+<!ENTITY searchBox.title                                "Hľadať">
 
 <!-- Tooltips -->
 <!ENTITY addressbookToolbar.tooltip                     "Panel Adresár">
 <!ENTITY newContactButton.tooltip                       "Vytvoriť nový kontakt adresára">
 <!ENTITY newlistButton.tooltip                          "Vytvoriť nový zoznam">
 <!ENTITY editItemButton.tooltip                         "Upraviť označenú položku">
 <!ENTITY newmsgButton.tooltip                           "Odoslať správu">
 <!ENTITY newIM.tooltip                                  "Odoslať rýchlu správu alebo začať chatovať (Instant message - IM)">
deleted file mode 100644
--- a/toolkit/chrome/global/headsUpDisplay.dtd
+++ /dev/null
@@ -1,64 +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 DevTools Code
-   -
-   - The Initial Developer of the Original Code is
-   - Mozilla Foundation
-   - Portions created by the Initial Developer are Copyright (C) 2010
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   David Dahl <ddahl@mozilla.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 hud.title "Vývojárska konzola">
-
-<!ENTITY errFile.label   "Zdrojový súbor:">
-<!ENTITY errLine.label   "Riadok:">
-<!ENTITY errColumn.label "Stĺpec:">
-
-<!ENTITY all.label          "Všetko">
-<!ENTITY all.accesskey      "e">
-<!ENTITY errors.label       "Chyby">
-<!ENTITY errors.accesskey   "C">
-<!ENTITY warnings.label     "Upozornenia">
-<!ENTITY warnings.accesskey "U">
-<!ENTITY messages.label     "Správy">
-<!ENTITY messages.accesskey "S">
-<!ENTITY clear.label        "Vymazať">
-<!ENTITY clear.accesskey    "V">
-<!ENTITY codeEval.label     "Kód:">
-<!ENTITY codeEval.accesskey "K">
-<!ENTITY evaluate.label     "Vyhodnotiť">
-<!ENTITY evaluate.accesskey "h">
-
-<!ENTITY copyCmd.label       "Kopírovať">  
-<!ENTITY copyCmd.accesskey   "o"> 
-<!ENTITY copyCmd.commandkey  "C"> 
-<!ENTITY closeCmd.commandkey "w">  
-<!ENTITY focus1.commandkey   "l">  
-<!ENTITY focus2.commandkey   "d">  
--- a/toolkit/chrome/global/headsUpDisplay.properties
+++ b/toolkit/chrome/global/headsUpDisplay.properties
@@ -4,17 +4,16 @@ typeNetwork=Sieť:
 typeException=Výnimka:  
 typeCssParser=Parser CSS: 
 typeStrict=Striktné upozornenie: 
 msgCategory=Kategória: 
 errFile=Zdrojový súbor: %S
 errLine=Riadok: %S
 errLineCol=Riadok: %S, stĺpec: %S
 errCode=Zdrojový kód:
-hudTitle=Vývojárska konzola
 jsWorkspaceTitle=Pracovný priestor JS
 btnHide=Skryť
 btnPrefs=Nastavenia
 btnMutation=Mutácia DOM
 tipMutation=Prepnúť zaznamenávanie udalostí mutácií DOM
 btnNetwork=Sieť
 tipNetwork=Prepnúť zaznamenávanie udalostí siete
 btnCSSParser=Upozornenia CSS
@@ -29,9 +28,10 @@ btnWarn=Upozornenia
 tipWarn=Prepnúť zaznamenávanie upozornení
 btnLog=Záznam
 tipLog=Prepnúť vytváranie záznamu
 btnGlobal=Globálne správy
 tipGlobal=Prepnúť zaznamenávanie globálnych správ
 localConsole=Lokálna konzola
 btnClear=Vymazať konzolu
 tipClear=Vymazať výstup konzoly
+stringFilter=Filter
 stringFilterClear=Vymazať filter
--- a/toolkit/chrome/mozapps/extensions/extensions.dtd
+++ b/toolkit/chrome/mozapps/extensions/extensions.dtd
@@ -1,58 +1,71 @@
 <!ENTITY addons.windowTitle                   "Správca doplnkov">
 <!ENTITY search.placeholder                   "Hľadať v doplnkoch">
 <!ENTITY loading.label                        "Načítava sa…">
 <!ENTITY listEmpty.installed.label            "Nemáte nainštalované žiadne doplnky tohto typu">
+<!ENTITY listEmpty.availableUpdates.label     "Neboli nájdené žiadne aktualizácie">
+<!ENTITY listEmpty.recentUpdates.label        "V poslednom čase ste neaktualizovali žiadne doplnky">
+<!ENTITY listEmpty.findUpdates.label          "Vyhľadať aktualizácie">
 <!ENTITY listEmpty.search.label               "Neboli nájdené žiadne doplnky">
 <!ENTITY listEmpty.button.label               "Ďalšie informácie o doplnkoch">
 
 <!-- categories / views -->
 <!-- LOCALIZATION NOTE: These should match the header-* entries in extensions.properties -->
 <!ENTITY view.search.label                    "Vyhľadávanie">
 <!ENTITY view.discover.label                  "Získať doplnky">
 <!ENTITY view.locales.label                   "Jazyky">
 <!ENTITY view.searchengines.label             "Vyhľadávacie moduly">
 <!ENTITY view.features.label                  "Rozšírenia">
 <!ENTITY view.appearance.label                "Témy vzhľadu">
 <!ENTITY view.plugins.label                   "Zásuvné moduly">
+<!ENTITY view.recentUpdates.label             "Nedávno aktualizované">
+<!ENTITY view.availableUpdates.label          "Dostupné aktualizácie">
 
 <!-- addon updates -->
 <!ENTITY updates.updateNow.label              "Aktualizovať doplnky">
+<!ENTITY updates.updateAddonsNow.label        "Aktualizovať doplnky">
+<!ENTITY updates.updateAddonsNow.accesskey    "A">
+<!ENTITY updates.viewUpdates.label            "Zobraziť nedávne aktualizácie">
+<!ENTITY updates.viewUpdates.accesskey        "e">
+<!ENTITY updates.backgroudUpdateCheck.label   "Automaticky vyhľadávať aktualizácie">
+<!ENTITY updates.backgroudUpdateCheck.accesskey "u">
 <!ENTITY updates.updating.label               "Aktualizujú sa doplnky">
 <!ENTITY updates.installed.label              "Vaše doplnky boli aktualizované.">
 <!ENTITY updates.downloaded.label             "Aktualizácie pre vaše doplnky boli prevzaté.">
 <!ENTITY updates.restart.label                "Zmeny sa prejavia až po reštartovaní">
 <!ENTITY updates.noneFound.label              "Neboli nájdené žiadne aktualizácie">
+<!ENTITY updates.manualUpdatesFound.label     "Zobraziť dostupné aktualizácie">
 
 <!-- addon actions -->
 <!ENTITY cmd.showDetails.label                "Zobraziť ďalšie informácie">
 <!ENTITY cmd.showDetails.accesskey            "Z">
 <!ENTITY cmd.findUpdates.label                "Vyhľadať aktualizácie">
 <!ENTITY cmd.findUpdates.accesskey            "h">
 <!ENTITY cmd.preferences.label                "Nastavenia">
 <!ENTITY cmd.preferences.accesskey            "N">
 <!ENTITY cmd.about.label                      "O doplnku">
 <!ENTITY cmd.about.accesskey                  "O">
 
 <!ENTITY cmd.enableAddon.label                "Povoliť">
 <!ENTITY cmd.enableAddon.accesskey            "v">
-<!ENTITY cmd.enableAddon.tooltip              "Povoliť tento doplnok">
 <!ENTITY cmd.disableAddon.label               "Zakázať">
 <!ENTITY cmd.disableAddon.accesskey           "a">
-<!ENTITY cmd.disableAddon.tooltip             "Zakázať tento doplnok">
 <!ENTITY cmd.uninstallAddon.label             "Odstrániť">
 <!ENTITY cmd.uninstallAddon.accesskey         "d">
-<!ENTITY cmd.uninstallAddon.tooltip           "Odinštalovať tento doplnok">
 <!ENTITY cmd.showPreferences.label            "Nastavenia">
 <!ENTITY cmd.showPreferences.tooltip          "Zmeniť nastavenia tohto doplnku">
 <!ENTITY cmd.contribute.label                 "Prispieť">
 <!ENTITY cmd.contribute.accesskey             "r">
 <!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">
 
 <!-- detail view -->
 <!ENTITY detail.version.label                 "Verzia">
 <!ENTITY detail.updated.label                 "Aktualizované">
 <!ENTITY detail.creator.label                 "Vývojár">
 <!ENTITY detail.homepage.label                "Domovská stránka">
 <!ENTITY detail.numberOfDownloads.label       "Prevzatí">
 
@@ -93,19 +106,25 @@
 
 <!ENTITY search.filter.label                  "Zobraziť:">
 <!ENTITY search.filter.installed.label        "Nainštalované doplnky">
 <!ENTITY search.filter.available.label        "Dostupné doplnky">
 
 <!ENTITY addon.homepage                       "Domovská stránka">
 <!ENTITY addon.unknownDate                    "neznáme">
 <!ENTITY addon.disabled.postfix               "(zakázané)">
+<!ENTITY addon.update.postfix                 "Aktualizovať">
 <!ENTITY addon.undo.label                     "Späť?">
 <!ENTITY addon.undo.tooltip                   "Vrátiť späť vykonanú akciu">
 <!ENTITY addon.undoUninstall.label            "Späť?">
 <!ENTITY addon.undoUninstall.tooltip          "Ponechať tento doplnok nainštalovaný">
 <!ENTITY addon.restartNow.label               "Reštartovať teraz">
 <!ENTITY addon.restartNow.tooltip             "Reštartovaním dokončíte inštaláciu">
 <!ENTITY addon.install.label                  "Nainštalovať">
 <!ENTITY addon.install.tooltip                "Nainštalovať tento doplnok">
+<!ENTITY addon.updateNow.label                "Aktualizovať teraz">
+<!ENTITY addon.updateNow.tooltip              "Nainštalovať aktualizácie pre tento doplnok">
 <!ENTITY addon.checkingForUpdates.label       "Vyhľadávajú sa aktualizácie…">
+<!ENTITY addon.releaseNotes.label             "Poznámky k vydaniu:">
+<!ENTITY addon.loadingReleaseNotes.label      "Načítavajú sa…">
+<!ENTITY addon.errorLoadingReleaseNotes.label "Pri načítaní poznámok k vydaniu sa vyskytla chyba.">
 
 <!ENTITY addon.createdBy.label                "Autor: ">
--- a/toolkit/chrome/mozapps/extensions/extensions.properties
+++ b/toolkit/chrome/mozapps/extensions/extensions.properties
@@ -9,16 +9,18 @@ aboutAddon=O doplnku %S
 #LOCALIZATION NOTE These should match the view.*.label entities in extensions.dtd
 header-search=Výsledky vyhľadávania
 header-discover=Získať doplnky
 header-locale=Jazyky
 header-searchengine=Vyhľadávacie moduly
 header-extension=Rozšírenia
 header-theme=Témy vzhľadu
 header-plugin=Zásuvné moduly
+header-recentUpdates=Nedávno aktualizované
+header-availableUpdates=Dostupné aktualizácie
 
 #LOCALIZATION NOTE (header-goBack) %S is the name of the pane to go back to
 header-goBack=Naspäť na panel %S
 
 #LOCALIZATION NOTE (uninstallNotice) %S is the add-on name
 uninstallNotice=Doplnok %S bol odstránený.
 
 #LOCALIZATION NOTE (numReviews) #1 is the number of reviews
@@ -38,12 +40,19 @@ installInstalling=Inštaluje sa
 installInstallPending=Pripravené na inštaláciu
 installUpdatePending=Pripravené na aktualizáciu
 installEnablePending=Na povolenie doplnku je potrebný reštart
 installDisablePending=Na zakázanie doplnku je potrebný reštart
 installFailed=Chyba pri inštalácii
 installCancelled=Inštalácia zrušená
 
 #LOCALIZATION NOTE: %1$S is the addon name, %2$S is brand name
-restartToEnable=Doplnok %1$% bude povolený po reštartovaní aplikácie %2$S
+restartToEnable2=Doplnok %1$S bude povolený po reštartovaní aplikácie %2$S
 restartToDisable=Doplnok %1$S bude zakázaný po reštartovaní aplikácie %2$S
 restartToUninstall=Doplnok %1$S bude odstránený po reštartovaní aplikácie %2$S
 restartToUpgrade=Doplnok %1$S bude aktualizovaný po reštartovaní aplikácie %2$S
+
+uninstallAddonTooltip=Odinštalovať tento doplnok
+uninstallAddonRestartRequiredTooltip=Odinštalovať tento doplnok (vyžaduje reštart)
+enableAddonTooltip=Povoliť tento doplnok
+enableAddonRestartRequiredTooltip=Povoliť tento doplnok (vyžaduje reštart)
+disableAddonTooltip=Zakázať tento doplnok
+disableAddonRestartRequiredTooltip=Zakázať tento doplnok (vyžaduje reštart)