update FIREFOX_4_0b4_BUILD1 FIREFOX_4_0b4_BUILD2 FIREFOX_4_0b4_BUILD3 FIREFOX_4_0b4_RELEASE
authorsektormaster@atlas.sk
Mon, 16 Aug 2010 13:04:00 +0200
changeset 107 72929c2e14725223eac3e7895b2038b8705bb0e3
parent 100 b85496c923c755c9903988dd8abcab5ef3760619
child 110 46b099a1fc2b67e954c9d92b16b33dd483616bd1
child 116 93e858f05574c4060b2ea1f1bc5abe505e31ed93
push id1
push usersledru@mozilla.com
push dateFri, 05 Dec 2014 02:19:11 +0000
update
browser/chrome/browser/aboutSessionRestore.dtd
browser/chrome/browser/aboutSyncTabs.dtd
browser/chrome/browser/browser.dtd
browser/chrome/browser/browser.properties
browser/chrome/browser/places/places.properties
browser/chrome/browser/preferences/preferences.properties
browser/chrome/browser/preferences/sync.dtd
browser/chrome/browser/preferences/tabs.dtd
browser/chrome/browser/quitDialog.properties
browser/chrome/browser/syncBrand.dtd
browser/chrome/browser/syncGenericChange.properties
browser/chrome/browser/syncSetup.dtd
browser/chrome/browser/syncSetup.properties
browser/feedback/main.dtd
browser/feedback/main.properties
browser/profile/bookmarks.inc
calendar/chrome/calendar/calendar.properties
calendar/chrome/calendar/menuOverlay.dtd
calendar/chrome/calendar/preferences/alarms.dtd
calendar/chrome/calendar/preferences/categories.dtd
calendar/chrome/calendar/preferences/general.dtd
calendar/chrome/lightning/lightning.properties
calendar/chrome/sunbird/aboutDialog.dtd
dom/chrome/layout/HtmlForm.properties
mail/chrome/messenger/appleMailImportMsgs.properties
mail/chrome/messenger/glodaFacetView.properties
mail/chrome/messenger/imapMsgs.properties
mail/chrome/messenger/messenger.dtd
mail/chrome/messenger/messenger.properties
mail/chrome/messenger/mime.properties
mail/chrome/messenger/msgHdrViewOverlay.dtd
mail/chrome/messenger/msgmdn.properties
mail/chrome/messenger/preferences/advanced.dtd
mail/chrome/messenger/shutdownWindow.properties
mail/chrome/mozldap/ldap.properties
mobile/chrome/browser.dtd
mobile/chrome/browser.properties
mobile/chrome/notification.dtd
mobile/chrome/overrides/aboutRights.dtd
mobile/profile/bookmarks.inc
security/manager/chrome/pipnss/nsserrors.properties
suite/chrome/browser/navigator.dtd
suite/chrome/browser/navigator.properties
suite/chrome/common/bookmarks/addBookmark.dtd
suite/chrome/common/bookmarks/bm-props.dtd
suite/chrome/common/bookmarks/bm-props.properties
suite/chrome/common/bookmarks/bookmarks.dtd
suite/chrome/common/bookmarks/bookmarks.properties
suite/chrome/common/bookmarks/editBookmarkOverlay.dtd
suite/chrome/common/bookmarks/findBookmark.dtd
suite/chrome/common/bookmarks/moveBookmarks.dtd
suite/chrome/common/bookmarks/places.dtd
suite/chrome/common/bookmarks/sortFolder.dtd
suite/chrome/common/feeds/subscribe.dtd
suite/chrome/common/help/cs_nav_prefs_navigator.xhtml
suite/chrome/common/help/help-index1.rdf
suite/chrome/common/help/help-win.rdf
suite/chrome/common/help/mail_help.xhtml
suite/chrome/common/help/mailnews_account_settings.xhtml
suite/chrome/common/help/mailnews_offline.xhtml
suite/chrome/common/help/mailnews_preferences.xhtml
suite/chrome/common/help/nav_help.xhtml
suite/chrome/common/help/suite-toc.rdf
suite/chrome/common/places/places.properties
suite/chrome/common/pref/pref-content.dtd
suite/chrome/common/pref/pref-links.dtd
suite/chrome/common/quitDialog.properties
suite/chrome/common/utilityOverlay.properties
suite/chrome/mailnews/appleMailImportMsgs.properties
suite/chrome/mailnews/imapMsgs.properties
suite/chrome/mailnews/mime.properties
suite/chrome/mailnews/msgmdn.properties
suite/chrome/mailnews/pref/replicationProgress.properties
suite/chrome/mailnews/shutdownWindow.properties
suite/chrome/mozldap/ldap.properties
toolkit/chrome/global/aboutSupport.dtd
toolkit/chrome/global/config.dtd
toolkit/chrome/global/headsUpDisplay.properties
toolkit/chrome/mozapps/extensions/extensions.dtd
toolkit/chrome/mozapps/plugins/plugins.properties
--- a/browser/chrome/browser/aboutSessionRestore.dtd
+++ b/browser/chrome/browser/aboutSessionRestore.dtd
@@ -6,15 +6,13 @@
                         you may translate "crash" instead (even though it's IT-speak) -->
 <!ENTITY restorepage.problemDesc    "&brandShortName; má problémy s obnovením vašich naposledy otvorených okien a kariet. Toto zvyčajne spôsobuje posledná načítaná webová stránka.">
 <!ENTITY restorepage.tryThis        "Môžete skúsiť:">
 <!ENTITY restorepage.restoreSome    "Odstrániť jednu alebo viacero kariet, ktoré by mohli spôsobovať problémy">
 <!ENTITY restorepage.startNew       "Spustiť úplne novú reláciu prehliadania">
 
 <!ENTITY restorepage.tryagainButton "Obnoviť">
 <!ENTITY restorepage.restore.access "b">
-<!ENTITY restorepage.cancelButton   "Spustiť novú reláciu">
-<!ENTITY restorepage.cancel.access  "r">
 
 <!ENTITY restorepage.restoreHeader  "Obnoviť">
 <!ENTITY restorepage.listHeader     "Okná a karty">
 <!-- LOCALIZATION NOTE: &#37;S will be replaced with a number. -->
 <!ENTITY restorepage.windowLabel    "Okno č. &#37;S">
--- a/browser/chrome/browser/aboutSyncTabs.dtd
+++ b/browser/chrome/browser/aboutSyncTabs.dtd
@@ -1,15 +1,18 @@
+<!-- LOCALIZATION NOTE (tabs.otherComputers.label): Keep this in sync with syncTabsMenu.label from browser.dtd -->
 <!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.openTab.accesskey          "O">
-<!ENTITY tabs.context.openMultipleTabs.label     "Otvoriť označené karty">
-<!ENTITY tabs.context.openMultipleTabs.accesskey "O">
-<!ENTITY tabs.context.bookmarkSingleTab.label    "Pridať kartu medzi záložky…">
-<!ENTITY tabs.context.bookmarkSingleTab.accesskey     "z">
-<!ENTITY tabs.context.bookmarkMultipleTabs.label "Pridať označené karty medzi záložky…">
+<!-- LOCALIZATION NOTE (tabs.context.openTab.accesskey, tabs.context.openMultipleTabs.accesskey):
+     Only one of these will show at a time (based on selection), so reusing accesskey is ok. -->
+<!ENTITY tabs.context.openTab.label                   "Otvoriť túto kartu">
+<!ENTITY tabs.context.openTab.accesskey               "O">
+<!ENTITY tabs.context.openMultipleTabs.label          "Otvoriť označené karty">
+<!ENTITY tabs.context.openMultipleTabs.accesskey      "O">
+<!ENTITY tabs.context.bookmarkSingleTab.label         "Pridať túto kartu medzi záložky…">
+<!ENTITY tabs.context.bookmarkSingleTab.accesskey     "P">
+<!ENTITY tabs.context.bookmarkMultipleTabs.label      "Pridať označené karty medzi záložky…">
 <!ENTITY tabs.context.bookmarkMultipleTabs.accesskey  "P">
-<!ENTITY tabs.context.refreshList.label          "Obnoviť zoznam">
+<!ENTITY tabs.context.refreshList.label               "Obnoviť zoznam">
 <!ENTITY tabs.context.refreshList.accesskey           "b">
 
--- a/browser/chrome/browser/browser.dtd
+++ b/browser/chrome/browser/browser.dtd
@@ -7,16 +7,21 @@
 <!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  moveTabTo.label                    "Presunúť túto kartu do…">
+<!ENTITY  moveTabTo.accesskey                "e">
+<!ENTITY  createNewGroup.label               "Vytvoriť novú skupinu">
+<!ENTITY  createNewGroup.accesskey           "V">
+<!ENTITY  namedGroups.label                  "Pomenované skupiny">
 <!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">
@@ -114,23 +119,26 @@
 <!ENTITY stopCmd.accesskey              "Z">
 <!ENTITY stopCmd.macCommandKey          ".">
 <!ENTITY stopButton.tooltip             "Zastaviť načítavanie tejto stránky">
 <!ENTITY goEndCap.tooltip               "Prejsť na adresu zadanú v paneli s adresou">
 <!ENTITY feedButton.tooltip             "Prihlásiť sa k odberu kanála tejto stránky…">
 <!ENTITY printButton.label              "Tlačiť">
 <!ENTITY printButton.tooltip            "Tlačiť túto stránku">
 
+<!ENTITY backForwardItem.title          "Naspäť/Dopredu">
 <!ENTITY locationItem.title             "Panel s adresou">
 <!ENTITY searchItem.title               "Vyhľadávanie">
 <!ENTITY throbberItem.title             "Indikátor aktivity">
 <!ENTITY bookmarksItem.title            "Záložky">
 
 <!-- Toolbar items -->
 <!ENTITY homeButton.label "Domov">
+<!ENTITY tabViewButton2.label          "Skupiny kariet">
+<!ENTITY tabViewButton2.tooltip        "Zoskupte si svoje karty">
 
 <!ENTITY bookmarksButton.label          "Záložky">
 <!ENTITY bookmarksButton.tooltip        "Zobraziť záložky">
 <!ENTITY bookmarksButton.accesskey  "Z">
 <!ENTITY bookmarksCmd.commandkey "b">
 
 <!ENTITY bookmarksMenuButton.label          "Záložky">
 <!ENTITY bookmarksMenuButton.tooltip        "Zobraziť záložky">
@@ -167,17 +175,17 @@
 <!ENTITY errorConsoleCmd.accesskey    "C">
 <!ENTITY errorConsoleCmd.commandkey   "j">
 
 <!ENTITY webConsoleCmd.label          "Webová konzola">
 <!ENTITY webConsoleCmd.accesskey      "W">
 <!ENTITY webConsoleCmd.commandkey     "k">
 
 <!ENTITY inspectMenu.label            "Preskúmať stránku">
-<!ENTITY inspectMenu.accesskey        "e">
+<!ENTITY inspectMenu.accesskey        "P">
 <!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">
@@ -227,16 +235,18 @@
 <!ENTITY privateBrowsingCmd.start.label         "Spustiť režim Súkromné prehliadanie">
 <!ENTITY privateBrowsingCmd.start.accesskey     "k">
 <!ENTITY privateBrowsingCmd.stop.label          "Ukončiť režim Súkromné prehliadanie">
 <!ENTITY privateBrowsingCmd.stop.accesskey      "k">
 <!ENTITY privateBrowsingCmd.commandkey          "P">
 
 <!ENTITY viewMenu.label "Zobraziť">
 <!ENTITY viewMenu.accesskey "Z">
+<!ENTITY showTabView2.label     "Skupiny kariet">
+<!ENTITY showTabView2.accesskey     "S">
 <!ENTITY viewToolbarsMenu.label "Panely s nástrojmi">
 <!ENTITY viewToolbarsMenu.accesskey "P">
 <!ENTITY viewSidebarMenu.label "Bočný panel">
 <!ENTITY viewSidebarMenu.accesskey "B">
 <!ENTITY viewCustomizeToolbar.label "Prispôsobiť…">
 <!ENTITY viewCustomizeToolbar.accesskey "P">
 <!ENTITY viewTabsOnTop.label            "Karty navrchu">
 <!ENTITY viewTabsOnTop.accesskey        "K">
@@ -439,17 +449,17 @@ you can use these alternative items. Oth
 <!ENTITY quitApplicationCmdMac.label    "Ukončiť &brandShortName;">
 <!ENTITY quitApplicationCmdMac.key      "Q">
 
 <!ENTITY closeCmd.label                "Zavrieť">
 <!ENTITY closeCmd.key                  "W">
 <!ENTITY closeCmd.accesskey            "Z">
 
 <!ENTITY pageStyleMenu.label           "Štýl stránky">
-<!ENTITY pageStyleMenu.accesskey       "s">
+<!ENTITY pageStyleMenu.accesskey       "n">
 <!ENTITY pageStyleNoStyle.label        "Žiadny štýl">
 <!ENTITY pageStyleNoStyle.accesskey    "a">
 <!ENTITY pageStylePersistentOnly.label "Základný štýl stránky">
 <!ENTITY pageStylePersistentOnly.accesskey "Z">
 
 <!ENTITY pageReportIcon.tooltip "Zmeniť nastavenie blokovania vyskakovacích okien pre tento server">
 
 <!ENTITY allowPopups.accesskey "o">
@@ -505,16 +515,17 @@ just addresses the organization to follo
 
 <!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">
 
+<!-- LOCALIZATION NOTE (syncTabsMenu.label): This appears in the history menu -->
 <!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">
--- a/browser/chrome/browser/browser.properties
+++ b/browser/chrome/browser/browser.properties
@@ -184,17 +184,17 @@ offlineApps.manageUsageAccessKey=Z
 identity.identified.verifier=Overil ju %S
 identity.identified.verified_by_you=Pre túto stránku ste pridali bezpečnostnú výnimku.
 identity.identified.state_and_country=%S, %S
 
 identity.encrypted=Pripojenie k tejto stránke je z dôvodu ochrany pred sledovaním zabezpečené.
 identity.unencrypted=Pripojenie k tejto stránke nie je zabezpečené.
 identity.mixed_content=Pripojenie k tejto stránke je len čiastočne zabezpečené a neochraňuje tak pred možným sledovaním.
 
-identity.unknown.tooltip=Táto webová stránka neposkytuje informácie o identite.
+identity.unknown.tooltip=Táto webová stránka neposkytuje informácie o identite
 
 identity.ownerUnknown2=(neznámy)
 
 # Downloads Monitor Panel
 # LOCALIZATION NOTE (activeDownloads1, pausedDownloads1): Semi-colon list of plural
 # forms. See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # #1 number of downloads; #2 time left
 # examples: 1 active download (2 minutes remaining); 11 paused downloads
@@ -219,18 +219,18 @@ pu.notifyButton.label=Podrobnosti…
 pu.notifyButton.accesskey=d
 # LOCALIZATION NOTE %S will be replaced by the short name of the application.
 puNotifyText=%S bol aktualizovaný
 puAlertTitle=%S aktualizovaný
 puAlertText=Ďalšie informácie
 
 # Geolocation UI
 
-# LOCALIZATION NOTE (geolocation.shareLocation geolocation.dontShareLocation geolocation.alwaysShare geolocation.neverShare): 
-#If you're having trouble with the word Share, please use Allow and Block in your language.
+# LOCALIZATION NOTE (geolocation.shareLocation geolocation.dontShareLocation geolocation.alwaysShare geolocation.neverShare):
+# If you're having trouble with the word Share, please use Allow and Block in your language.
 geolocation.shareLocation=Prezradiť polohu
 geolocation.shareLocation.accesskey=e
 geolocation.dontShareLocation=Neprezradiť
 geolocation.dontShareLocation.accesskey=a
 geolocation.alwaysShare=Vždy prezradiť
 geolocation.alwaysShare.accesskey=d
 geolocation.neverShare=Nikdy neprezradiť
 geolocation.neverShare.accesskey=k
@@ -270,10 +270,13 @@ privateBrowsingNeverAsk=&Túto správu viac nezobrazovať
 # of tabs in the current browser window. It will always be 2 at least.
 # See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
 ctrlTab.showAll.label=;Zobraziť všetky #1 karty;Zobraziť všetkých #1 kariet
 
 # LOCALIZATION NOTE (addKeywordTitleAutoFill): %S will be replaced by the page's title
 # Used as the bookmark name when saving a keyword for a search field.
 addKeywordTitleAutoFill=Hľadať %S
 
+# TabView
+tabView2.title=Skupiny kariet prehliadača %S
+
 extensions.{972ce4c6-7e08-4474-a285-3208198ce6fd}.name=Predvolená
 extensions.{972ce4c6-7e08-4474-a285-3208198ce6fd}.description=Predvolená téma
--- a/browser/chrome/browser/places/places.properties
+++ b/browser/chrome/browser/places/places.properties
@@ -1,15 +1,15 @@
 deleteHost=Odstrániť všetko z %S
 deleteDomain=Odstrániť celú doménu %S
 
 load-js-data-url-error=Z bezpečnostných dôvodov nemôžu byť adresy obsahujúce údaje alebo JavaScript načítané z okna histórie alebo bočného panela.
 noTitle=(bez názvu)
 
-bookmarksMenuEmptyFolder=(prázdny)
+bookmarksMenuEmptyFolder=(prázdne)
 
 bookmarksBackupTitle=Názov súboru so zálohou záložiek
 
 bookmarksRestoreAlertTitle=Obnoviť záložky
 bookmarksRestoreAlert=Týmto nahradíte všetky svoje aktuálne záložky zálohou. Naozaj to chcete urobiť?
 bookmarksRestoreTitle=Vybrať zálohu záložiek
 bookmarksRestoreFilterName=JSON
 bookmarksRestoreFilterExtension=*.json
--- a/browser/chrome/browser/preferences/preferences.properties
+++ b/browser/chrome/browser/preferences/preferences.properties
@@ -105,10 +105,10 @@ 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.
+differentAccount.label=Týmto vymažete všetky nastavenia a informácie o účte služby Sync.
 differentAccountConfirm.label=Vymazať všetky informácie
--- a/browser/chrome/browser/preferences/sync.dtd
+++ b/browser/chrome/browser/preferences/sync.dtd
@@ -35,11 +35,10 @@
 <!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
@@ -1,17 +1,17 @@
 <!ENTITY newWindowsAsTabs.label       "Nové okná otvárať ako novú kartu">
 <!ENTITY newWindowsAsTabs.accesskey   "N">
 
 <!ENTITY warnCloseMultipleTabs.label      "Upozorniť pri zatváraní viacerých kariet">
-<!ENTITY warnCloseMultipleTabs.accesskey  "z">
+<!ENTITY warnCloseMultipleTabs.accesskey  "o">
 
 <!ENTITY warnOpenManyTabs.label           "Upozorniť, ak by otvorenie viacerých kariet spôsobilo spomalenie &brandShortName;u">
 <!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">
+<!ENTITY showTabsInTaskbar.accesskey      "Z">
--- a/browser/chrome/browser/quitDialog.properties
+++ b/browser/chrome/browser/quitDialog.properties
@@ -1,10 +1,10 @@
-quitDialogTitle=Ukončiť %S
-restartDialogTitle=Reštartovať %S
+quitDialogTitle=Ukončenie prehliadača %S
+restartDialogTitle=Reštartovanie prehliadača %S
 
 quitTitle=U&končiť
 restartTitle=&Reštartovať
 cancelTitle=&Zrušiť
 saveTitle=&Uložiť a ukončiť
 neverAsk=Toto okno už viac nezobrazovať
 message=Chcete, aby %S uložil otvorené karty a okná a použil ich pri nasledujúcom spustení?
 messageNoWindows=Chcete, aby %S uložil otvorené karty a použil ich pri nasledujúcom spustení?
--- a/browser/chrome/browser/syncBrand.dtd
+++ b/browser/chrome/browser/syncBrand.dtd
@@ -1,2 +1,2 @@
 <!ENTITY syncBrand.shortName.label  "Sync">
-<!ENTITY syncBrand.fullName.label   "Firefox Sync">
\ No newline at end of file
+<!ENTITY syncBrand.fullName.label   "Firefox Sync">
--- a/browser/chrome/browser/syncGenericChange.properties
+++ b/browser/chrome/browser/syncGenericChange.properties
@@ -9,21 +9,18 @@ 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.
+change.passphrase.introText = Vaša tajná fráza musí mať minimálne 12 znakov. Služba Sync používa 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.
--- a/browser/chrome/browser/syncSetup.dtd
+++ b/browser/chrome/browser/syncSetup.dtd
@@ -13,17 +13,17 @@
 <!ENTITY signIn.username.label      "Používateľské meno">
 <!ENTITY signIn.username.accesskey  "o">
 <!ENTITY signIn.password.label      "Heslo">
 <!ENTITY signIn.password.accesskey  "H">
 <!ENTITY signIn.serverURL.label     "Adresa URL servera">
 <!ENTITY signIn.serverURL.accesskey "d">
 
 <!-- New Account Page 1: Basic Account Info -->
-<!ENTITY setup.newAccountPage.title.label  "Vytvorenie nového účtu &syncBrand.shortName.label;">
+<!ENTITY setup.newAccountPage.title.label  "Vytvorenie nového účtu služby &syncBrand.shortName.label;">
 <!ENTITY setup.confirmPassword.label  "Potvrdenie hesla">
 <!ENTITY setup.confirmPassword.accesskey  "P">
 <!ENTITY setup.emailAddress.label     "E-mailová adresa">
 <!ENTITY setup.emailAddress.accesskey "E">
 <!-- LOCALIZATION NOTE: tosAgree1, tosLink, tosAgree2, ppLink, tosAgree3 are
      joined with implicit white space, so spaces in the strings aren't necessary -->
 <!ENTITY setup.tosAgree1.label      "Súhlasím s">
 <!ENTITY setup.tosAgree1.accesskey  "S">
@@ -74,19 +74,19 @@
 <!ENTITY passphraseGroupbox.label     "Zadajte tajnú frázu">
 <!ENTITY passphraseDesc3.label        "Zadajte vašu tajnú frázu, ktorá musí byť rovnaká ako tá, ktorú ste použili pri šifrovaní vašich údajov.">
 <!ENTITY passphraseHelp.label         "Vaša tajná fráza má minimálne 12 znakov a nie je to vaše heslo. Uloženú frázu môžete nájsť na niektorom z vašich ďalších počítačov, kde v nastaveniach prehliadača zvolíte panel Bezpečnosť a položku Uložené heslá. Ak frázu nenájdete, môžete požiadať o novú, pričom ale stratíte všetky údaje uložené na serveri.">
 <!ENTITY changePassphrase.label       "Zmeniť tajnú frázu">
 <!ENTITY verifying.label              "Overuje sa…">
 
 <!-- New & Existing Account: Merge Options -->
 <!ENTITY setup.mergeChoicePage.title.label "Ako chcete začať?">
-<!ENTITY choice.merge.main.label      "Spojiť údaje tohto počítača s údajmi účtu &syncBrand.shortName.label;">
+<!ENTITY choice.merge.main.label      "Spojiť údaje tohto počítača s údajmi nachádzajúcimi sa na účte služby &syncBrand.shortName.label;">
 <!ENTITY choice.merge.recommend.label "Mozilla odporúča túto možnosť pre všetkých používateľov.">
-<!ENTITY choice.client.main.label     "Nahradiť všetky údaje na tomto počítači tými z účtu &syncBrand.fullName.label;">
+<!ENTITY choice.client.main.label     "Nahradiť všetky údaje na tomto počítači tými z účtu služby &syncBrand.fullName.label;">
 <!ENTITY choice.server.main.label     "Nahradiť údaje na všetkých ostatných zariadeniach lokálnymi údajmi">
 
 <!-- New & Existing Account: Confirm Merge Options -->
 <!ENTITY confirm.caption.label        "Potvrdenie výberu">
 <!ENTITY confirm.merge.label          "Zvolili ste si spojiť vaše údaje na tomto počítači s údajmi z ostatných vašich zariadení, ktoré používajú &syncBrand.fullName.label;.">
 <!ENTITY confirm.client.label         "Všetky údaje &brandShortName; na tomto počítači budú odstránené, vrátane:">
 <!ENTITY confirm.client.moreinfo.label "&brandShortName; potom skopíruje údaje &syncBrand.fullName.label; na tento počítač.">
 <!ENTITY confirm.client.warning.label "UPOZORNENIE: týmto nahradíte všetky údaje prehliadača &brandShortName; na tomto počítači!">
--- a/browser/chrome/browser/syncSetup.properties
+++ b/browser/chrome/browser/syncSetup.properties
@@ -1,13 +1,16 @@
 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
 
+# LOCALIZATION NOTE (additionalClients.label, bookmarkCount.label, historyCount.label, passwordCount.label).
+# We'll fix the lack of PluralForms in bug 583661.
 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
+# Several other strings are used (via Weave.Status.login), but they come from
+#  /services/sync */
--- a/browser/feedback/main.dtd
+++ b/browser/feedback/main.dtd
@@ -1,17 +1,19 @@
 <!ENTITY testpilot.brand.label                      "Test Pilot">
 <!-- browser window: menu and status bar -->
 <!ENTITY testpilot.settings.label                   "Nastavenia">
-<!ENTITY testpilot.settings.notifyMeWhen.label      "Upozorniť ma:">
+<!ENTITY testpilot.settings.dataSubmission.label    "Odosielanie údajov">
+<!ENTITY testpilot.settings.notifications.label     "Upozornenia">
+<!ENTITY testpilot.settings.notifyWhen.label        "Upozorniť ma…">
 <!ENTITY testpilot.settings.readyToSubmit.label     "Keď je štúdia pripravená na odoslanie">
 <!ENTITY testpilot.settings.newStudy.label          "Keď je dostupná nová štúdia">
 <!ENTITY testpilot.settings.hasNewResults.label     "Keď má štúdia nové výsledky">
 <!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.allYourStudies.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údií">
 <!ENTITY testpilot.studiesWindow.settings.label         "Nastavenia">
--- a/browser/feedback/main.properties
+++ b/browser/feedback/main.properties
@@ -1,8 +1,11 @@
+# description for add-on manager
+extensions.testpilot@labs.mozilla.com.description = Pomocou používateľských štúdií pomáha urobiť Firefox lepším.
+
 # common
 testpilot.fullBrandName = Mozilla Labs Test Pilot
 testpilot.moreInfo = Ďalšie informácie
 testpilot.submit = Odoslať
 testpilot.takeSurvey = Zúčastniť sa štúdie
 
 # Feedback button menu
 testpilot.turnOn = Zapnúť používateľské štúdie
--- a/browser/profile/bookmarks.inc
+++ b/browser/profile/bookmarks.inc
@@ -1,12 +1,12 @@
 #filter emptyLines
 
 # LOCALIZATION NOTE: The 'en-US' strings in the URLs will be replaced with
-# your locale code, and link to your translated pages as soon as they're 
+# your locale code, and link to your translated pages as soon as they're
 # live.
 
 #define bookmarks_title Záložky
 #define bookmarks_heading Záložky
 
 #define bookmarks_toolbarfolder Priečinok panela Záložky
 #define bookmarks_toolbarfolder_description Pridaním položiek do tohto priečinka dôjde k ich zobrazeniu v paneli Záložky
 
--- a/calendar/chrome/calendar/calendar.properties
+++ b/calendar/chrome/calendar/calendar.properties
@@ -227,16 +227,26 @@ updateFromServer=Zrušiť moje zmeny a znovu načítať
 proceedModify=Odoslať moje zmeny
 proceedDelete=Odstrániť
 dav_notDav=Zdroj na %1$S buď nie je súbor DAV alebo nie je dostupný.
 dav_davNotCaldav=Zdroj na %1$S je súbor DAV, ale nie je to kalendár typu CalDAV.
 itemPutError=Počas ukladania položky na server sa vyskytla chyba.
 itemDeleteError=Počas odstraňovania položky zo servera sa vyskytla chyba.
 caldavRequestError=Pri odosielaní pozvánky sa vyskytla chyba.
 caldavResponseError=Pri odosielaní odpovede sa vyskytla chyba.
+caldavRequestStatusCode=Kód stavu: %1$S
+caldavRequestStatusCodeStringGeneric=Požiadavka nemohla byť spracovaná.
+caldavRequestStatusCodeString400=Požiadavka obsahuje nesprávnu syntax a nemôže byť spracovaná.
+caldavRequestStatusCodeString403=Používateľ nemá dostatočné oprávnenie na vykonanie danej požiadavky.
+caldavRequestStatusCodeString404=Zdroj nebol nájdený.
+caldavRequestStatusCodeString409=Konflikt zdrojov.
+caldavRequestStatusCodeString412=Prekonfigurácia zlyhala.
+caldavRequestStatusCodeString500=Vnútorná chyba servera.
+caldavRequestStatusCodeString502=Nesprávna brána (nastavenie proxy servera?).
+caldavRequestStatusCodeString503=Vnútorná chyba servera (dočasná odstávka servera?).
 
 # LOCALIZATION NOTE (likelyTimezone):
 #   Translators, please put the most likely timezone(s) where the people using
 #   your locale will be.  Use the Olson ZoneInfo timezone name *in English*,
 #   ie "Europe/Paris", (continent or ocean)/(largest city in timezone).
 #   Order does not matter, except if two historically different zones now match,
 #   such as America/New_York and America/Toronto, will only find first listed.
 #   (Particularly needed to guess the most relevant timezones if there are
@@ -406,18 +416,18 @@ alarmYesterdayAt=Včera o %1$S
 # Alarm interface strings
 # LOCALIZATION NOTE: These strings do not get displayed. They are only visible
 # when exporting an item with i.e a DISPLAY alarm, that doesn't have a
 # description set, or an EMAIL alarm that doesn't have a summary set.
 alarmDefaultDescription=Predvolený popis Mozilla
 alarmDefaultSummary=Predvolený súhrn Mozilla
 
 # offline support strings (SUNBIRD ONLY)
-offlineTooltip=Práve ste v režime offline.
-onlineTooltip=Práve ste v režime online.
+offlineTooltip=Práve ste v režime offline
+onlineTooltip=Práve ste v režime online
 
 taskDetailsStatusNeedsAction=Vyžaduje akciu
 
 # LOCALIZATION NOTE (taskDetailsStatusInProgress):
 # used for a display of how much of a task is completed '25% Complete'
 #    %1$S will be replaced with the number of percentage completed
 taskDetailsStatusInProgress=Dokončená na %1$S%%
 taskDetailsStatusCompleted=Dokončená
--- a/calendar/chrome/calendar/menuOverlay.dtd
+++ b/calendar/chrome/calendar/menuOverlay.dtd
@@ -41,19 +41,19 @@
    -
    - ***** END LICENSE BLOCK ***** -->
 
 <!-- Event Menu -->
 <!ENTITY event.new.event                        "Nová udalosť…">
 <!ENTITY event.new.event.key                    "N">
 <!ENTITY event.new.event.accesskey              "u">
 
-<!ENTITY event.new.todo                         "Nová úloha…">
-<!ENTITY event.new.todo.key                     "T">
-<!ENTITY event.new.todo.accesskey               "N">
+<!ENTITY event.new.task                         "Nová úloha…">
+<!ENTITY event.new.task.key                     "K">
+<!ENTITY event.new.task.accesskey               "N">
 
 <!ENTITY calendar.new.server.label              "Nový súbor kalendára…">
 <!ENTITY calendar.new.server.key                "L">
 <!ENTITY calendar.new.server.accesskey          "l">
 
 <!ENTITY calendar.print.label                   "Tlačiť…">
 <!ENTITY calendar.print.key                     "P">
 <!ENTITY calendar.print.accesskey               "T">
--- a/calendar/chrome/calendar/preferences/alarms.dtd
+++ b/calendar/chrome/calendar/preferences/alarms.dtd
@@ -13,17 +13,17 @@
    -
    - The Original Code is Mozilla Calendar Preferences
    -
    - The Initial Developer of the Original Code is
    - Matthew Willis
    - Portions created by the Initial Developer are Copyright (C) 2006
    - the Initial Developer. All Rights Reserved.
    -
-   - Contributor(s): 
+   - Contributor(s):
    -   Cédric Corazza <cedric.corazza@wanadoo.fr>
    -
    - 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
--- a/calendar/chrome/calendar/preferences/categories.dtd
+++ b/calendar/chrome/calendar/preferences/categories.dtd
@@ -13,17 +13,17 @@
    -
    - The Original Code is Mozilla Calendar Preferences
    -
    - The Initial Developer of the Original Code is
    - Matthew Willis
    - Portions created by the Initial Developer are Copyright (C) 2006
    - the Initial Developer. All Rights Reserved.
    -
-   - Contributor(s): 
+   - Contributor(s):
    -   Cédric Corazza <cedric.corazza@wanadoo.fr>
    -
    - 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
--- a/calendar/chrome/calendar/preferences/general.dtd
+++ b/calendar/chrome/calendar/preferences/general.dtd
@@ -13,17 +13,17 @@
    -
    - The Original Code is Mozilla Calendar Preferences
    -
    - The Initial Developer of the Original Code is
    - Matthew Willis
    - Portions created by the Initial Developer are Copyright (C) 2006
    - the Initial Developer. All Rights Reserved.
    -
-   - Contributor(s): 
+   - Contributor(s):
    -   Cédric Corazza <cedric.corazza@wanadoo.fr>
    -
    - 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
--- a/calendar/chrome/lightning/lightning.properties
+++ b/calendar/chrome/lightning/lightning.properties
@@ -9,17 +9,17 @@
 # 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 Lightning l10n code.
 #
 # The Initial Developer of the Original Code is Joey Minta <jminta@gmail.com>
-# 
+#
 # Portions created by the Initial Developer are Copyright (C) 2006
 # the Initial Developer. All Rights Reserved.
 #
 # Contributor(s):
 #   Matthew Willis <lilmatt@mozilla.com>
 #   Clint Talbert <ctalbert.moz@gmail.com>
 #   Mauro Cicognini <mcicogni@libero.it>
 #
--- a/calendar/chrome/sunbird/aboutDialog.dtd
+++ b/calendar/chrome/sunbird/aboutDialog.dtd
@@ -9,17 +9,17 @@
    -
    - Software distributed under the License is distributed on an "AS IS" basis,
    - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
    - for the specific language governing rights and limitations under the
    - License.
    -
    - The Original Code is Mozilla Firefox about dialog.
    -
-   - The Initial Developer of the Original Code is 
+   - The Initial Developer of the Original Code is
    - Blake Ross (blaker@netscape.com).
    - Portions created by the Initial Developer are Copyright (C) 2002
    - the Initial Developer. All Rights Reserved.
    -
    - Contributor(s): Matthew Willis <mattwillis@gmail.com>
    -                 Ehsan Akhgari <ehsan.akhgari@gmail.com>
    -
    - Alternatively, the contents of this file may be used under the terms of
--- a/dom/chrome/layout/HtmlForm.properties
+++ b/dom/chrome/layout/HtmlForm.properties
@@ -33,18 +33,18 @@
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
 
 Reset=Obnoviť pôvodné
 Submit=Odoslať
 Browse=Prehľadávať…
 FileUpload=Odovzdať súbor
-# LOCALIZATION NOTE (IsIndexPromptWithSpace): The last character of the string 
-# should be a space (U+0020) in most locales. The prompt is followed by an 
-# input field. The space needs be escaped in the property file to avoid 
+# LOCALIZATION NOTE (IsIndexPromptWithSpace): The last character of the string
+# should be a space (U+0020) in most locales. The prompt is followed by an
+# input field. The space needs be escaped in the property file to avoid
 # trimming.
 IsIndexPromptWithSpace=Toto je index, v ktorom sa dá vyhľadávať. Zadajte hľadané kľúčové slová:\u0020
 ForgotPostWarning=Formulár obsahuje enctype=%S, ale neobsahuje method=POST. Preto bude odoslaný pomocou method=GET bez kódovania.
 ForgotFileEnctypeWarning=Formulár obsahuje vstupné pole pre odovzdanie súboru, ale vo formulári chýba method=POST a enctype=multipart/form-data. Preto súbor nebude odoslaný.
 # LOCALIZATION NOTE (DefaultFormSubject): %S will be replaced with brandShortName
 DefaultFormSubject=Formulár odoslaný z %S
 
--- a/mail/chrome/messenger/appleMailImportMsgs.properties
+++ b/mail/chrome/messenger/appleMailImportMsgs.properties
@@ -8,17 +8,17 @@
 #
 # 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 Apple Mail importer code.
 #
-# The Initial Developer of the Original Code is 
+# The Initial Developer of the Original Code is
 # Håkan Waara <hwaara@gmail.com>.
 # Portions created by the Initial Developer are Copyright (C) 2008
 # the Initial Developer. All Rights Reserved.
 #
 # Contributor(s):
 #
 # Alternatively, the contents of this file may be used under the terms of
 # either the GNU General Public License Version 2 or later (the "GPL"), or
--- a/mail/chrome/messenger/glodaFacetView.properties
+++ b/mail/chrome/messenger/glodaFacetView.properties
@@ -173,17 +173,17 @@ glodaFacetView.results.header.countLabel
 
 # LOCALIZATION NOTE(glodaFacetView.results.message.openAsList.label): The
 #  label for the button/link that causes us to display all of the messages in
 #  the active set in a new thread pane display tab, closing the current faceting
 #  tab.
 glodaFacetView.results.message.openAsList.label=Otvoriť ako zoznam
 # LOCALIZATION NOTE(glodaFacetView.results.message.openAsList.tooltip): The
 #  tooltip to display when hovering over the openAsList label.
-glodaFacetView.results.message.openAsList.tooltip=Zobraziť zoznam všetkých správ na novej karte a zavrieť túto kartu.
+glodaFacetView.results.message.openAsList.tooltip=Zobraziť zoznam všetkých správ na novej karte a zavrieť túto kartu
 
 # LOCALIZATION NOTE(glodaFacetView.results.message.sort.label): The
 #  label next to the choice of sort order
 glodaFacetView.results.message.sort.label=usporiadať podľa:
 # LOCALIZATION NOTE(glodaFacetView.results.message.sort.relevance):
 # a clickable label causing the sort to be done by most relevant messages first.
 glodaFacetView.results.message.sort.relevance=relevantnosť
 # LOCALIZATION NOTE(glodaFacetView.results.message.sort.date):
--- a/mail/chrome/messenger/imapMsgs.properties
+++ b/mail/chrome/messenger/imapMsgs.properties
@@ -425,20 +425,20 @@ 5115=Tiket Kerberos/GSSAPI nebol serverom IMAP %S akceptovaný. Skontrolujte, či ste prihlásený k doméne Kerberos/GSSAPI realm.
 
 ## @name IMAP_LOGIN_DISABLED
 ## @loc None
 # LOCALIZATION NOTE (5116): %S is the account name
 5116=Nie je možné prihlásiť sa k účtu %S, pretože server neumožňuje overenie bez použitia STARTTLS alebo SSL/TLS. Skúste v nastaveniach účtu povoliť zabezpečené sieťové pripojenie alebo bezpečné overenie.
 
 ## @name IMAP_SERVER_COMMAND_FAILED
 ## @loc None
-# LOCALIZATION NOTE (5117): 
+# LOCALIZATION NOTE (5117):
 # Place the word %1$S in your translation where the name of the account name should appear.
 # Place the word %2$S in your translation where the server response should appear.
-5117=Aktuálne vykonávaný príkaz zlyhal. Poštový server pre účet %1$S odpovedal: %2$S 
+5117=Aktuálne vykonávaný príkaz zlyhal. Poštový server pre účet %1$S odpovedal: %2$S
 
 ## @name IMAP_FOLDER_COMMAND_FAILED
 ## @loc None
 # LOCALIZATION NOTE (5118): Do not translate the word %S below.
 # Place the word %1$S in your translation where the name of the account should appear.
 # Place the word %2$S in your translation where the name of the folder should appear.
 # Place the word %3$S in your translation where the server response should appear.
 5118=Práve vykonávaná operácia na priečinku '%2$S' zlyhala. Poštový server pre účet %1$S odpovedal: %3$S
--- a/mail/chrome/messenger/messenger.dtd
+++ b/mail/chrome/messenger/messenger.dtd
@@ -741,17 +741,17 @@ you can use these alternative items. Oth
 <!-- MDN Bar -->
 <!ENTITY mdnBarMessage.label "Odosielateľ žiada potvrdenie o prečítaní tejto správy. Chcete toto potvrdenie odoslať?">
 <!ENTITY mdnBarIgnoreButton.label "Ignorovať žiadosť">
 <!ENTITY mdnBarSendButton.label "Odoslať potvrdenie">
 
 <!-- Quick Search Bar -->
 <!-- LOCALIZATION NOTE (quickSearchCmd.key):
      This is actually the key used for the global message search box; we have
-     not changed 
+     not changed
      -->
 <!ENTITY quickSearchCmd.key "k">
 <!-- LOCALIZATION NOTE (searchAllMessages.label.base):
      This is the base of the empty text for the global search box.  We replace
      #1 with the contents of the appropriate
      searchAllMessages.keyLabel2.* value for the platform.
      The goal is to convey to the user that typing in the box will allow them
      to search for messages globally and that there is a hotkey they can press
--- a/mail/chrome/messenger/messenger.properties
+++ b/mail/chrome/messenger/messenger.properties
@@ -376,17 +376,17 @@ macBiffNotification_messages=Nové správy (celkom %1$S) od %2$S.
 macBiffNotification_messages_extra=Nové správy (celkom %1$S) od %2$S a ďalších %3$S správ.
 # Used to separate names/email addresses in a list.  Note the trailing space ', '
 macBiffNotification_separator=,\u0020
 
 # For the Quota tab in the mail folder properties dialog
 quotaUsedFree=Využitých %S z %S
 quotaPercentUsed=Zaplnené: %S%%
 percent=%S%%
-quotaTooltip=Kvóta pre IMAP: využitých %S kB z celkovo %S kB. Kliknutím získate ďalšie informácie.
+quotaTooltip=Kvóta pre IMAP: využitých %S kB z celkovo %S kB. Kliknutím získate ďalšie informácie
 
 # for message views
 confirmViewDeleteTitle=Potvrdenie odstránenia
 confirmViewDeleteMessage=Naozaj chcete odstrániť tento pohľad?
 
 # for virtual folders
 confirmSavedSearchTitle=Potvrdenie odstránenia
 confirmSavedSearchDeleteMessage=Naozaj chcete odstrániť toto uložené hľadanie?
--- a/mail/chrome/messenger/mime.properties
+++ b/mail/chrome/messenger/mime.properties
@@ -40,119 +40,119 @@
 
 # Mail subject
 ## @name MIME_MHTML_SUBJECT
 ## @loc None
 1000=Predmet
 
 # Resent-Comments
 ## @name MIME_MHTML_RESENT_COMMENTS
-## @loc 
+## @loc
 1001=Znovu odoslané - komentáre
 
 # Resent-Date
 ## @name MIME_MHTML_RESENT_DATE
-## @loc 
+## @loc
 1002=Znovu odoslané - dátum
 
 # Resent-Sender
 ## @name MIME_MHTML_RESENT_SENDER
-## @loc 
+## @loc
 1003=Znovu odoslané - odosielateľ
 
 # Resent-From
 ## @name MIME_MHTML_RESENT_FROM
-## @loc 
+## @loc
 1004=Znovu odoslané - od
 
 # Resent-To
 ## @name MIME_MHTML_RESENT_TO
-## @loc 
+## @loc
 1005=Znovu odoslané - komu
 
 # Resent-CC
 ## @name MIME_MHTML_RESENT_CC
-## @loc 
+## @loc
 # LOCALIZATION NOTE (1006): Do not translate "CC" below.
 1006=Znovu odoslané - kópia
 
 # Date
 ## @name MIME_MHTML_DATE
-## @loc 
+## @loc
 1007=Dátum
 
 # Sender
 ## @name MIME_MHTML_SENDER
-## @loc 
+## @loc
 1008=Odosielateľ
 
 # From
 ## @name MIME_MHTML_FROM
-## @loc 
+## @loc
 1009=Od
 
 # Reply-To
 ## @name MIME_MHTML_REPLY_TO
-## @loc 
+## @loc
 1010=Odpoveď komu
 
 # Organization
 ## @name MIME_MHTML_ORGANIZATION
-## @loc 
+## @loc
 1011=Organizácia
 
 # To
 ## @name MIME_MHTML_TO
-## @loc 
+## @loc
 1012=Pre
 
 # CC
 ## @name MIME_MHTML_CC
-## @loc 
+## @loc
 # LOCALIZATION NOTE (1013): Do not translate "CC" below.
 1013=Kópia
 
 # Newsgroups
 ## @name MIME_MHTML_NEWSGROUPS
-## @loc 
+## @loc
 1014=Diskusné skupiny
 
 # Followup-To
 ## @name MIME_MHTML_FOLLOWUP_TO
-## @loc 
+## @loc
 1015=Pokračovať na
 
 # References
 ## @name MIME_MHTML_REFERENCES
-## @loc 
+## @loc
 1016=Referencie
 
 # Message ID
 ## @name MIME_MHTML_MESSAGE_ID
-## @loc 
+## @loc
 1021=ID správy
 
 # BCC
 ## @name MIME_MHTML_BCC
-## @loc 
+## @loc
 1023=Skrytá kópia
 
 # Link to doc
 ## @name MIME_MSG_LINK_TO_DOCUMENT
-## @loc 
+## @loc
 1026=Odkaz na dokument
 
 # Get Doc info
 ## @name MIME_MSG_DOCUMENT_INFO
-## @loc 
+## @loc
 1027=<B>Informácie o dokumente:</B>
 
 # Msg Attachment
 ## @name MIME_MSG_ATTACHMENT
-## @loc 
+## @loc
 1028=Príloha
 
 # Partial Message Format 1
 ## @name MIME_MSG_PARTIAL_FMT_1
 ## @loc
 # LOCALIZATION NOTE (1037): In the following line, translate only the word, "Truncated!".
 1037=<P><CENTER><TABLE BORDER CELLSPACING=5 CELLPADDING=10 WIDTH="80%%"><TR><TD ALIGN=CENTER><FONT SIZE="+1"><B>Skrátené!</B></FONT><HR>
 
@@ -168,24 +168,24 @@ 1038=<B>Táto správa presahuje nastavenú maximálnu veľkosť, preto bolo prevzatých len pár prvých riadkov.<P>Kliknutím <A HREF="
 ## @name MIME_MSG_PARTIAL_FMT_3
 ## @loc
 # LOCALIZATION NOTE (1039): This section must begin with the ">" sign and end with the tags,"</B></TD></TR></TABLE></CENTER>"
 # Do not translate "</A>" tag.
 1039=">sem</A> prevezmete zvyšnú časť správy.</B></TD></TR></TABLE></CENTER>
 
 # default attachment name
 ## @name MIME_MSG_DEFAULT_ATTACHMENT_NAME
-## @loc 
+## @loc
 # LOCALIZATION NOTE (1040): Do not translate "%s" below.
 # Place the %s where you wish the part number of the attachment to appear
 1040=Časť %s
 
 # default forwarded message prefix
 ## @name MIME_FORWARDED_MESSAGE_HTML_USER_WROTE
-## @loc 
+## @loc
 1041=----- Pôvodná správa -----
 
 # Partial Message Format2 1
 ## @name MIME_MSG_PARTIAL_FMT2_1
 ## @loc
 # LOCALIZATION NOTE (1042): In the following line, translate only the words, "Not Downloaded".
 1042=<P><CENTER><TABLE BORDER CELLSPACING=5 CELLPADDING=10 WIDTH="80%%"><TR><TD ALIGN=CENTER><FONT SIZE="+1"><B>Neprevzaté</B></FONT><HR>
 
--- a/mail/chrome/messenger/msgHdrViewOverlay.dtd
+++ b/mail/chrome/messenger/msgHdrViewOverlay.dtd
@@ -100,19 +100,19 @@
 <!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.label    "Otvoriť všetky prílohy…">
 <!ENTITY openAllAttachmentsCmd.accesskey    "O">
-<!ENTITY saveAllAttachmentsCmd.label "Uložiť všetky prílohy">
+<!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">
 <!ENTITY copyLinkCmd.accesskey "K">
--- a/mail/chrome/messenger/msgmdn.properties
+++ b/mail/chrome/messenger/msgmdn.properties
@@ -1,44 +1,45 @@
-#***** BEGIN LICENSE BLOCK *****
-#Version: MPL 1.1/GPL 2.0/LGPL 2.1
+# ***** 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/
+# 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.
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
 #
-#The Original Code is mozilla.
+# The Original Code is mozilla.
 #
-#The Initial Developer of the Original Code is
+# The Initial Developer of the Original Code is
 #  Jeff Tsai <jt95070@netscape.net>.
-#Portions created by the Initial Developer are Copyright (C) 2002
-#the Initial Developer. All Rights Reserved.
+# Portions created by the Initial Developer are Copyright (C) 2002
+# the Initial Developer. All Rights Reserved.
 #
-#Contributor(s):
+# Contributor(s):
 #  Seth Spitzer <sspitzer@netscape.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 GPL or the LGPL. If you do not delete
-#the provisions above, a recipient may use your version of this file under
-#the terms of any one of the MPL, the GPL or the LGPL.
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
 #
 #***** END LICENSE BLOCK *****
+
 ## Msg Mdn Report strings
 MsgMdnDisplayed=Poznamka: Vasa sprava bola zobrazena na pocitaci adresata. Nie je vsak zarucene, ze sprava bola precitana cela a ze adresat porozumel jej obsahu.
 MsgMdnDispatched=Sprava bola bud vytlacena, odfaxovana alebo odoslana dalej bez citania. Nie je iste, ci si adresat spravu precita neskor.
 MsgMdnProcessed=Sprava bola automaticky spracovana postovym klientom adresata bez citania. Nie je iste, ci si adresat spravu precita neskor.
 MsgMdnDeleted=Sprava bola odstranena. Nie je iste, ci vobec bola citana. Je vsak mozne, ze adresat ju neskor obnovi a precita.
 MsgMdnDenied=Adresat tejto spravy si nezelal odoslat vam potvrdenie o precitani.
 MsgMdnFailed=Nastala chyba! Nepodarilo sa vytvorit alebo odoslat vam platne potvrdenie o precitani.
 # LOCALIZATION NOTE : Do not translate the word "%S" below.
--- a/mail/chrome/messenger/preferences/advanced.dtd
+++ b/mail/chrome/messenger/preferences/advanced.dtd
@@ -40,17 +40,17 @@
 <!ENTITY secondsLabel.label             "sekundách od zobrazenia">
 <!ENTITY openMsgIn.label                "Správy otvárať:">
 <!ENTITY openMsgInNewTab.label          "Na novej karte">
 <!ENTITY openMsgInNewTab.accesskey      "k">
 <!ENTITY reuseExpRadio0.label           "V novom okne správy">
 <!ENTITY reuseExpRadio0.accesskey       "n">
 <!ENTITY reuseExpRadio1.label           "V existujúcom okne so správou">
 <!ENTITY reuseExpRadio1.accesskey       "x">
-<!ENTITY closeMsgWindowOnDelete.label   "Pri odstraňovaní správy zatvoriť jej okno">
+<!ENTITY closeMsgWindowOnMoveOrDelete.label   "Pri odstraňovaní alebo presunutí správy zatvoriť jej okno">
 <!ENTITY closeMsgWindowOnDelete.accesskey "d">
 
 <!-- Update -->
 <!ENTITY autoCheck.label                "Pravidelne kontrolovať aktualizácie pre:">
 <!ENTITY enableAppUpdate.label          "&brandShortName;">
 <!ENTITY enableAppUpdate.accesskey      "h">
 <!ENTITY enableAddonsUpdate.label       "Nainštalované doplnky">
 <!ENTITY enableAddonsUpdate.accesskey   "N">
--- a/mail/chrome/messenger/shutdownWindow.properties
+++ b/mail/chrome/messenger/shutdownWindow.properties
@@ -9,17 +9,17 @@
 # Software distributed under the License is distributed on an "AS IS" basis,
 # WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
 # for the specific language governing rights and limitations under the
 # License.
 #
 # The Original Code is mozilla.org code.
 #
 # The Initial Developer of the Original Code is
-# 
+#
 # Portions created by the Initial Developer are Copyright (C) 2007
 # the Initial Developer. All Rights Reserved.
 #
 # Contributor(s):
 #   Nick Kreeger <nick.kreeger@park.edu>
 #
 # Alternatively, the contents of this file may be used under the terms of
 # either of the GNU General Public License Version 2 or later (the "GPL"),
--- a/mail/chrome/mozldap/ldap.properties
+++ b/mail/chrome/mozldap/ldap.properties
@@ -1,9 +1,9 @@
-# 
+#
 # ***** 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/
 #
--- a/mobile/chrome/browser.dtd
+++ b/mobile/chrome/browser.dtd
@@ -39,17 +39,17 @@
 <!ENTITY addonOptions.label        "Možnosti">
 <!ENTITY addonEnable.label         "Povoliť">
 <!ENTITY addonDisable.label        "Zakázať">
 <!ENTITY addonInstall2.label       "Pridať do &brandShortName;u">
 <!ENTITY addonUninstall.label      "Odinštalovať">
 <!ENTITY addonCancel.label         "Zrušiť">
 <!ENTITY addonShowPage.label       "Prejsť na stránku">
 
-<!ENTITY downloadsHeader.label     "Preberanie súborov">
+<!ENTITY downloadsHeader.label     "Prevzaté súbory">
 
 <!ENTITY downloadShowPage.label    "Prejsť na stránku">
 <!ENTITY downloadShow2.label       "Nájsť">
 <!ENTITY downloadOpen2.label       "Otvoriť">
 <!ENTITY downloadCancel.label      "Zrušiť">
 <!ENTITY downloadPause.label       "Pozastaviť">
 <!ENTITY downloadResume.label      "Pokračovať">
 <!ENTITY downloadRetry.label       "Znova">
@@ -85,8 +85,15 @@
 <!ENTITY consoleErrColumn.label    "Stĺpec:">
 
 <!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ť">
+
+<!ENTITY pageactions.saveas.pdf      "Uložiť ako PDF">
+<!ENTITY pageactions.share.page      "Zdieľať stránku">
+<!ENTITY pageactions.password.forget "Zabudnúť heslo">
+<!ENTITY pageactions.reset           "Vymazať nastavenia stránky">
+<!ENTITY pageactions.findInPage      "Hľadať na stránke">
+<!ENTITY pageactions.search.addNew   "Pridať vyhľadávací modul">
--- a/mobile/chrome/browser.properties
+++ b/mobile/chrome/browser.properties
@@ -9,17 +9,17 @@ addonsSearchFail.label=%S nemohol získať doplnky
 addonsSearchFail.button=OK
 addonsSearchSuccess2.button=Vymazať hľadanie
 addonsBrowseAll.label=Prehľadávať všetky doplnky
 addonsBrowseAll.description=Na stránke addons.mozilla.org nájdete množstvo doplnkov
 
 # LOCALIZATION NOTE (addonsSearchMore.label): Semi-colon list of plural forms.
 # See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # #1 total number of add-ons that match the search terms
-addonsSearchMore.label=Zobraziť výsledok;Zobraziť #1 výsledky;Zobraziť všetkých #1 výsledkov 
+addonsSearchMore.label=Zobraziť výsledok;Zobraziť #1 výsledky;Zobraziť všetkých #1 výsledkov
 
 # LOCALIZATION NOTE (addonsSearchMore.description): Semi-colon list of plural forms.
 # See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # #1 number of search results currently visible
 addonsSearchMore.description=Ak tento výsledok nie je to, čo hľadáte, skúste toto;Ak medzi týmito #1 výsledkami nie je to, čo hľadáte, skúste toto;Ak medzi týmito #1 výsledkami nie je to, čo hľadáte, skúste toto
 
 addonsSearchEngine.description=Integrované vyhľadávanie
 
@@ -91,17 +91,17 @@ xpinstallDisabledButton=Povoliť
 
 # Site Identity
 identity.identified.verifier=Overil ju %S
 identity.identified.verified_by_you=Pre túto stránku ste pridali bezpečnostnú výnimku
 identity.identified.state_and_country=%S, %S
 identity.identified.title_with_country=%S (%S)
 identity.encrypted2=Zabezpečené
 identity.unencrypted2=Nezabezpečené
-identity.unknown.tooltip=Táto webová stránka neposkytuje informácie o identite.
+identity.unknown.tooltip=Táto webová stránka neposkytuje informácie o identite
 identity.ownerUnknown2=(neznámy)
 
 # Geolocation UI
 geolocation.share=Prezradiť
 geolocation.dontShare=Neprezradiť
 geolocation.siteWantsToKnow=%S chce vedieť, kde sa nachádzate.
 
 # New Tab Popup
@@ -136,25 +136,19 @@ tabs.closeWarningPromptMe=Upozorniť vždy, ak sa pokúšam zavrieť viac kariet naraz
 
 # Homepage
 # LOCALIZATION NOTE: homepage.custom2 is the text displayed on the selector button if
 # the user selects a webpage to be the startpage. We can't display the entire URL
 # or webpage title on the menulist
 homepage.custom2=Vlastná stránka
 
 # Page Actions
-pageactions.saveas.pdf=Uložiť ako PDF
-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/chrome/notification.dtd
+++ b/mobile/chrome/notification.dtd
@@ -1,8 +1,8 @@
 
-<!-- 
+<!--
      LOCALIZATION NOTE (geolocation.learnMore): Use the
      unicode ellipsis char, \u2026,
      or use "..." unless \u2026 doesn't suit traditions in your
      locale.
 -->
 <!ENTITY geolocation.learnMore         "Ďalšie info…">
--- a/mobile/chrome/overrides/aboutRights.dtd
+++ b/mobile/chrome/overrides/aboutRights.dtd
@@ -1,9 +1,9 @@
-<!-- LOCALIZATION NOTE: this file is a direct copy of 
+<!-- LOCALIZATION NOTE: this file is a direct copy of
      toolkit/locales/en-US/chrome/global/aboutRights.dtd
      with the exception of the XXX comment below. -->
 
 <!-- rights.locale-direction instead of the usual local.dir entity, so RTL can skip translating page. -->
 <!ENTITY rights.locale-direction "ltr">
 <!ENTITY rights.pagetitle       "about:rights">
 <!ENTITY rights.intro-header    "Informácie o vašich právach">
 <!ENTITY rights.intro "&brandFullName; je voľne šíriteľný otvorený softvér vytvorený spoločenstvom tisícov prispievateľov z celého sveta. Tu je niekoľko faktov, o ktorých by ste mali vedieť:">
--- a/mobile/profile/bookmarks.inc
+++ b/mobile/profile/bookmarks.inc
@@ -1,12 +1,12 @@
 #filter emptyLines
 
 # LOCALIZATION NOTE: The 'en-US' strings in the URLs will be replaced with
-# your locale code, and link to your translated pages as soon as they're 
+# your locale code, and link to your translated pages as soon as they're
 # live.
 
 # LOCALIZATION NOTE: Some of these URLs are currently 404s, but should be coming
 # online shortly.
 
 # LOCALIZATION NOTE (bookmarks_title):
 # title for the folder that will contains the default bookmarks
 #define bookmarks_title Záložky
--- a/security/manager/chrome/pipnss/nsserrors.properties
+++ b/security/manager/chrome/pipnss/nsserrors.properties
@@ -99,20 +99,20 @@ SSL_ERROR_INTERNAL_ERROR_ALERT=Partner hlási, že došlo k internej chybe.
 SSL_ERROR_USER_CANCELED_ALERT=Používateľ partnera zrušil spojenie.
 SSL_ERROR_NO_RENEGOTIATION_ALERT=Partner nepovoľuje opakované realizovanie spojenia bezpečnostných parametrov protokolu SSL.
 SSL_ERROR_SERVER_CACHE_NOT_CONFIGURED=Vyrovnávacia pamäť servera SSL nie je nakonfigurovaná a nie je pre tento socket zakázaná.
 SSL_ERROR_UNSUPPORTED_EXTENSION_ALERT=Partner protokolu SSL nepodporuje požadované rozšírenie TLS hello.
 SSL_ERROR_CERTIFICATE_UNOBTAINABLE_ALERT=Partner protokolu SSL nemôže z dodanej adresy získať váš certifikát.
 SSL_ERROR_UNRECOGNIZED_NAME_ALERT=Partner protokolu SSL nemá certifikát pre požadovaný názov DNS.
 SSL_ERROR_BAD_CERT_STATUS_RESPONSE_ALERT=Partner protokolu SSL nemohol získať odozvu OCSP pre svoj certifikát.
 SSL_ERROR_BAD_CERT_HASH_VALUE_ALERT=Partner protokolu SSL hlási nesprávnu hodnotu transformácie certifikátu.
-SSL_ERROR_RX_UNEXPECTED_NEW_SESSION_TICKET=Protokol SSL prijal neočakávanú synchronizačnú správu New Session Ticket.                             
-SSL_ERROR_RX_MALFORMED_NEW_SESSION_TICKET=Protokol SSL prijal poškodenú synchronizačnú správu New Session Ticket.                                
-SSL_ERROR_DECOMPRESSION_FAILURE=Protokol SSL prijal komprimovaný záznam, ktorý nie je možné dekomprimovať.                                        
-SSL_ERROR_RENEGOTIATION_NOT_ALLOWED=Vyjednávanie nie je na tomto sockete SSL povolené.                                                    
+SSL_ERROR_RX_UNEXPECTED_NEW_SESSION_TICKET=Protokol SSL prijal neočakávanú synchronizačnú správu New Session Ticket.
+SSL_ERROR_RX_MALFORMED_NEW_SESSION_TICKET=Protokol SSL prijal poškodenú synchronizačnú správu New Session Ticket.
+SSL_ERROR_DECOMPRESSION_FAILURE=Protokol SSL prijal komprimovaný záznam, ktorý nie je možné dekomprimovať.
+SSL_ERROR_RENEGOTIATION_NOT_ALLOWED=Vyjednávanie nie je na tomto sockete SSL povolené.
 SSL_ERROR_UNSAFE_NEGOTIATION=Partner sa pokúsil o zastaranú (potenciálne zraniteľnú) synchronizáciu.
 SSL_ERROR_RX_UNEXPECTED_UNCOMPRESSED_RECORD=Protokol SSL prijal neočakávaný dekomprimovaný záznam.
 SEC_ERROR_IO=Počas bezpečnostného overenia došlo k chybe vstupu a výstupu.
 SEC_ERROR_LIBRARY_FAILURE=chyba bezpečnostnej knižnice.
 SEC_ERROR_BAD_DATA=bezpečnostná knižnica: prijaté nesprávne údaje.
 SEC_ERROR_OUTPUT_LEN=bezpečnostná knižnica: chyba dĺžky výstupu.
 SEC_ERROR_INPUT_LEN=bezpečnostná knižnica zaznamenala chybu dĺžky vstupu.
 SEC_ERROR_INVALID_ARGS=bezpečnostná knižnica: neplatné parametre.
--- a/suite/chrome/browser/navigator.dtd
+++ b/suite/chrome/browser/navigator.dtd
@@ -153,16 +153,17 @@
 
 <!ENTITY proxyIcon.tooltip            "Presunutím ikony vytvorte odkaz na túto stránku">
 
 <!-- Toolbar items -->
 <!ENTITY  bookmarksButton.label       "Záložky">
 <!ENTITY  bookmarksButton.tooltip     "Zoznam záložiek">
 <!ENTITY  homeButton.label            "Domov">
 <!ENTITY  bookmarksToolbarItem.label  "Položky panela Záložky">
+<!ENTITY bookmarksToolbarChevron.tooltip "Zobraziť ďalšie záložky">
 
 <!-- Statusbar -->
 <!ENTITY  statusText.label            "Hotovo">
 
 <!ENTITY historyCmd.label           "História">
 <!ENTITY historyCmd.accesskey       "H">
 <!ENTITY history.commandKey         "H">
 
--- a/suite/chrome/browser/navigator.properties
+++ b/suite/chrome/browser/navigator.properties
@@ -48,14 +48,29 @@ 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
 
+menuOpenAllInTabs.label=Otvoriť všetko na kartách
+
 # 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"
+
+# Edit Bookmark UI
+editBookmarkPanel.pageBookmarkedTitle=Stránka pridaná medzi záložky
+editBookmarkPanel.pageBookmarkedDescription=%S si bude túto stránku pamätať.
+editBookmarkPanel.bookmarkedRemovedTitle=Záložka odstránená
+editBookmarkPanel.editBookmarkTitle=Upraviť túto záložku
+
+# LOCALIZATION NOTE (editBookmark.removeBookmarks.label)
+# Semi-colon list of plural forms. Replacement for #1 is
+# the number of bookmarks to be removed.
+# If this causes problems with localization you can also do "Remove Bookmarks (#1)"
+# instead of "Remove #1 Bookmarks".
+editBookmark.removeBookmarks.label=Odstrániť záložku;Odstrániť #1 záložky;Odstrániť #1 záložiek
\ No newline at end of file
deleted file mode 100644
--- a/suite/chrome/common/bookmarks/addBookmark.dtd
+++ /dev/null
@@ -1,50 +0,0 @@
-<!-- ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is Mozilla Communicator.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Ben Goodger <ben@netscape.com> (Original Author)
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either of the GNU General Public License Version 2 or later (the "GPL"),
-   - or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the GPL or the LGPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-
-<!ENTITY newBookmark.title          "Pridanie záložky">
-<!ENTITY selectFolder.title         "Výber priečinka">
-<!ENTITY name.label                 "Názov:">
-<!ENTITY name.accesskey             "N">
-<!ENTITY url.label                  "Adresa:">
-<!ENTITY url.accesskey              "A">
-<!ENTITY shortcutURL.label          "Kľúčové slovo:">
-<!ENTITY shortcutURL.accesskey      "K">
-<!ENTITY destination.label          "Cieľové umiestnenie:">
-<!ENTITY newFolder.label            "Nový priečinok…">
-<!ENTITY newFolder.accesskey        "o">
-<!ENTITY addGroup.label             "Pridať skupinu kariet medzi záložky">
-<!ENTITY addGroup.accesskey         "P">
deleted file mode 100644
--- a/suite/chrome/common/bookmarks/bm-props.dtd
+++ /dev/null
@@ -1,108 +0,0 @@
-<!-- ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is Mozilla Communicator.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Stephen Lamm          <slamm@netscape.com>
-   -   Robert John Churchill <rjc@netscape.com>
-   -   Ben Goodger           <ben@netscape.com>
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either of the GNU General Public License Version 2 or later (the "GPL"),
-   - or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the GPL or the LGPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-
-<!ENTITY bookmarks.windowtitle.label  "Vlastnosti pre &quot;**bm_title**&quot;">
-
-<!ENTITY generalInfo.label            "Všeobecné">
-<!ENTITY bookmarks.name.label         "Názov:">
-<!ENTITY bookmarks.name.accesskey     "N">
-<!ENTITY bookmarks.location.label     "Adresa:">
-<!ENTITY bookmarks.location.accesskey "A">
-<!ENTITY bookmarks.shortcut.label     "Kľúčové slovo:">
-<!ENTITY bookmarks.shortcut.accesskey "K">
-<!ENTITY bookmarks.description.label  "Popis:">
-<!ENTITY bookmarks.description.accesskey "P">
-
-<!ENTITY checkforupdates.legend.label "Kontrolovať aktualizácie">
-<!ENTITY when.label                   "Kedy:">
-<!ENTITY when.accesskey               "K">
-<!ENTITY from.label                   "od:">
-<!ENTITY from.accesskey               "o">
-<!ENTITY to.label                     "do: ">
-<!ENTITY to.accesskey                 "d">
-<!ENTITY every.label                  "každých">
-<!ENTITY every.accesskey              "c">
-<!ENTITY minutes.label                "minút">
-<!ENTITY notifications.legend.label   "Notifikácia">
-
-<!ENTITY checknever.label             "Nikdy">
-<!ENTITY checkeveryday.label          "Každý deň">
-<!ENTITY checkweekdays.label          "Pracovné dni">
-<!ENTITY checkweekends.label          "Každý víkend">
-<!ENTITY checkmondays.label           "Každý pondelok">
-<!ENTITY checktuesdays.label          "Každý utorok">
-<!ENTITY checkwednesdays.label        "Každú stredu">
-<!ENTITY checkthursdays.label         "Každý štvrtok">
-<!ENTITY checkfridays.label           "Každý piatok">
-<!ENTITY checksaturdays.label         "Každú sobotu">
-<!ENTITY checksundays.label           "Každú nedeľu">
-
-<!ENTITY midnight.label               "polnoci">
-<!ENTITY AMone.label                  "1:00">
-<!ENTITY AMtwo.label                  "2:00">
-<!ENTITY AMthree.label                "3:00">
-<!ENTITY AMfour.label                 "4:00">
-<!ENTITY AMfive.label                 "5:00">
-<!ENTITY AMsix.label                  "6:00">
-<!ENTITY AMseven.label                "7:00">
-<!ENTITY AMeight.label                "8:00">
-<!ENTITY AMnine.label                 "9:00">
-<!ENTITY AMten.label                  "10:00">
-<!ENTITY AMeleven.label               "11:00">
-<!ENTITY noon.label                   "poludnia">
-<!ENTITY PMone.label                  "13:00">
-<!ENTITY PMtwo.label                  "14:00">
-<!ENTITY PMthree.label                "15:00">
-<!ENTITY PMfour.label                 "16:00">
-<!ENTITY PMfive.label                 "17:00">
-<!ENTITY PMsix.label                  "18:00">
-<!ENTITY PMseven.label                "19:00">
-<!ENTITY PMeight.label                "20:00">
-<!ENTITY PMnine.label                 "21:00">
-<!ENTITY PMten.label                  "22:00">
-<!ENTITY PMeleven.label               "23:00">
-
-<!ENTITY notification.icon.label      "Zmeniť ikonu záložky">
-<!ENTITY notification.icon.accesskey  "Z">
-<!ENTITY notification.sound.label     "Prehrať zvuk">
-<!ENTITY notification.sound.accesskey "h">
-<!ENTITY notification.alert.label     "Zobraziť upozornenie">
-<!ENTITY notification.alert.accesskey "r">
-<!ENTITY notification.window.label    "Otvoriť webovú stránku v novom okne">
-<!ENTITY notification.window.accesskey "w">
new file mode 100644
--- /dev/null
+++ b/suite/chrome/common/bookmarks/bm-props.properties
@@ -0,0 +1,15 @@
+dialogAcceptLabelAddItem=Pridať
+dialogAcceptLabelSaveItem=Uložiť
+dialogAcceptLabelAddLivemark=Odoberať
+dialogAcceptLabelAddMulti=Pridať záložky
+dialogAcceptLabelEdit=Uložiť
+dialogTitleAddBookmark=Nová záložka
+dialogTitleAddLivemark=Odoberať ako aktívnu záložku
+dialogTitleAddFolder=Nový priečinok
+dialogTitleAddMulti=Nové záložky
+dialogTitleEdit=Vlastnosti "%S"
+
+bookmarkAllTabsDefault=[názov priečinka]
+newFolderDefault=Nový priečinok
+newBookmarkDefault=Nová záložka
+newLivemarkDefault=Nová aktívna záložka
deleted file mode 100644
--- a/suite/chrome/common/bookmarks/bookmarks.dtd
+++ /dev/null
@@ -1,120 +0,0 @@
-<!-- ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is Mozilla Communicator.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Stephen Lamm <slamm@netscape.com>
-   -   Blake Ross <blakeross@telocity.com>
-   -   Mike Kowalski <mikejk@ameritech.net>
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either of the GNU General Public License Version 2 or later (the "GPL"),
-   - or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the GPL or the LGPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-
-<!-- extracted from ./bookmarks.xul -->
-<!ENTITY menuBar.tooltip               "Panel Ponuka">
-<!ENTITY bookmarkToolbar.tooltip       "Panel Záložky">
-<!ENTITY menuitem.newBookmark.label    "Záložka">
-<!ENTITY menuitem.newBookmark.accesskey "Z">
-<!ENTITY menuitem.newFolder.label      "Priečinok">
-<!ENTITY menuitem.newFolder.accesskey  "P">
-<!ENTITY button.newFolder.label        "Nový priečinok">
-<!ENTITY button.newFolder.accesskey    "o">
-<!ENTITY menuitem.newSeparator.label   "Oddeľovač">
-<!ENTITY menuitem.newSeparator.accesskey "d">
-<!ENTITY button.newSeparator.label     "Nový oddeľovač">
-<!ENTITY button.newSeparator.accesskey "e">
-<!ENTITY menuitem.open.label           "Otvoriť súbor záložiek…">
-<!ENTITY menuitem.open.accesskey       "O">
-<!ENTITY menuitem.import.label         "Importovať…">
-<!ENTITY menuitem.import.accesskey     "I">
-<!ENTITY menuitem.export.label         "Exportovať…">
-<!ENTITY menuitem.export.accesskey     "E">
-<!ENTITY menuitem.find.label           "Hľadať záložky…">
-<!ENTITY menuitem.find.accesskey       "a">
-<!ENTITY menuitem.find.find.key        "F">
-<!ENTITY command.findBookmarks.label   "Hľadať…">
-<!ENTITY menuitem.properties.label     "Vlastnosti…">
-<!ENTITY menuitem.properties.accesskey "V">
-<!ENTITY button.properties.label       "Vlastnosti…">
-<!ENTITY button.properties.accesskey   "V">
-<!ENTITY menuitem.properties.key       "I">
-<!ENTITY button.rename.label           "Premenovať…">
-<!ENTITY button.rename.accesskey       "m">
-<!ENTITY button.delete.label           "Odstrániť">
-<!ENTITY button.delete.accesskey       "D">
-<!ENTITY menuitem.moveBookmark.label   "Presunúť záložky…">
-<!ENTITY menuitem.moveBookmark.accesskey "r">
-<!ENTITY button.moveBookmark.label     "Presunúť…">
-<!ENTITY button.moveBookmark.accesskey "r">
-<!ENTITY command.addBookmark.label     "Pridať…">
-<!ENTITY command.manageBookmarks.label "Spravovať">
-<!ENTITY command.sortFolder.label      "Usporiadať priečinok…">
-<!ENTITY command.sortFolder.accesskey  "U">
-<!ENTITY command.sortFolder.key        "S">
-<!ENTITY command.sortFolderByName.label "Usporiadať priečinok podľa názvu">
-<!ENTITY command.sortFolderByName.accesskey "n">
-
-<!ENTITY menuitem.view.command.toolbar.label        "Panel nástrojov">
-<!ENTITY menuitem.view.command.toolbar.accesskey    "P">
-<!ENTITY menuitem.view.show_columns.label           "Zobraziť stĺpce">
-<!ENTITY menuitem.view.show_columns.accesskey       "Z">
-<!ENTITY menuitem.newbookmarkfolder.label           "Nastaviť ako priečinok Záložky">
-<!ENTITY menuitem.newbookmarkfolder.accesskey       "N">
-<!ENTITY menuitem.newinternetsearchfolder.label     "Nastaviť ako priečinok vyhľadávania">
-<!ENTITY menuitem.newinternetsearchfolder.accesskey "a">
-<!ENTITY menuitem.personaltoolbarfolder.label       "Nastaviť ako priečinok Osobného panela">
-<!ENTITY menuitem.personaltoolbarfolder.accesskey   "O">
-
-<!ENTITY treecol.name.label             "Názov">
-<!ENTITY treecol.name.accesskey         "N">
-<!ENTITY treecol.name.tooltip           "Kliknutím usporiadate podľa názvu">
-<!ENTITY treecol.url.label              "Umiestnenie">
-<!ENTITY treecol.url.accesskey          "U">
-<!ENTITY treecol.url.tooltip            "Kliknutím usporiadate podľa umiestnenia">
-<!ENTITY treecol.shortcut.label         "Kľúčové slovo">
-<!ENTITY treecol.shortcut.accesskey     "K">
-<!ENTITY treecol.shortcut.tooltip       "Kliknutím usporiadate podľa kľúčového slova">
-<!ENTITY treecol.description.label      "Popis">
-<!ENTITY treecol.description.accesskey  "P">
-<!ENTITY treecol.description.tooltip    "Kliknutím usporiadate podľa popisu">
-<!ENTITY treecol.addedon.label          "Dátum pridania">
-<!ENTITY treecol.addedon.accesskey      "D">
-<!ENTITY treecol.addedon.tooltip        "Kliknutím usporiadate podľa dátumu pridania">
-<!ENTITY treecol.lastmod.label          "Naposledy upravené">
-<!ENTITY treecol.lastmod.accesskey      "a">
-<!ENTITY treecol.lastmod.tooltip        "Kliknutím usporiadate podľa poslednej úpravy">
-<!ENTITY treecol.lastvisit.label        "Naposledy navštívené">
-<!ENTITY treecol.lastvisit.accesskey    "e">
-<!ENTITY treecol.lastvisit.tooltip      "Kliknutím usporiadate podľa poslednej návštevy">
-
-<!ENTITY bookmarksWindowTitle.label     "Správca záložiek">
-
-<!ENTITY search.placeholder             "Hľadať v záložkách">
-<!ENTITY search.key                     "f">
deleted file mode 100644
--- a/suite/chrome/common/bookmarks/bookmarks.properties
+++ /dev/null
@@ -1,102 +0,0 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either of the GNU General Public License Version 2 or later (the "GPL"),
-# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-cmd_bm_open.label = Otvoriť
-cmd_bm_open.accesskey = O
-cmd_bm_expandfolder.label = Rozbaliť
-cmd_bm_expandfolder.accesskey = Z
-cmd_bm_collapsefolder.label = Zbaliť
-cmd_bm_collapsefolder.accesskey = Z
-cmd_bm_managefolder.label = Otvoriť v novom okne
-cmd_bm_managefolder.accesskey = m
-cmd_bm_cut.label = Vystrihnúť
-cmd_bm_cut.accesskey = V
-cmd_bm_copy.label = Kopírovať
-cmd_bm_copy.accesskey = K
-cmd_bm_paste.label = Prilepiť
-cmd_bm_paste.accesskey = P
-cmd_bm_delete.label = Odstrániť
-cmd_bm_delete.accesskey = d
-cmd_bm_movebookmark.label = Presunúť záložky…
-cmd_bm_movebookmark.accesskey = u…
-cmd_bm_rename.label = Premenovať…
-cmd_bm_rename.accesskey = e
-cmd_bm_properties.label = Vlastnosti
-cmd_bm_properties.accesskey = a
-cmd_bm_sortfolderbyname.label = Usporiadať priečinok podľa názvu
-cmd_bm_sortfolderbyname.accesskey = r
-cmd_bm_sortfolder.label = Usporiadať priečinok…
-cmd_bm_sortfolder.accesskey = s
-
-cmd_bm_openinnewwindow.label = Otvoriť v novom okne
-cmd_bm_openinnewwindow.accesskey = m
-cmd_bm_openinnewtab.label = Otvoriť na novej karte
-cmd_bm_openinnewtab.accesskey = k
-cmd_bm_newfolder.label = Nový priečinok…
-cmd_bm_newfolder.accesskey = N
-
-ile_newfolder = Nový priečinok
-
-window_title = %S - Záložky
-search_results_title = Výsledky vyhľadávania
-
-bookmarks_default_root = Záložky
-bookmarks_root = Záložky pre %S
-bookmarks_title = Správca záložiek
-status_foldercount = Niekoľko objektov (celkom %S)
-
-WebPageUpdated = Nasledujúca webová stránka bola aktualizovaná:
-WebPageTitle = Názov:
-WebPageURL = Adresa:
-WebPageAskDisplay = Chcete ju zobraziť?
-WebPageAskStopOption = Vypnúť kontrolu aktualizácií pre túto stránku
-
-pleaseEnterADuration = Zadajte dĺžku.
-pleaseSelectANotification = Zadajte aspoň jeden spôsob notifikácie.
-
-SortMenuItem = Usporiadané podľa %S
-
-ShortFindTitle = Hľadať: '%S'
-FindTitle = Hľadať: %S %S '%S' v %S
-
-ImportedIEFavorites = Importované Obľúbené položky IE
-ImportedIEStaticFavorites = Importované Obľúbené položky IE
-ImportedNetPositiveBookmarks = Importované záložky NetPositive
-DefaultPersonalToolbarFolder = Priečinok Osobného panela
-
-SelectOpen = Otvoriť súbor so záložkami
-SelectImport = Importovať súbor so záložkami
-EnterExport = Exportovať súbor so záložkami
new file mode 100644
--- /dev/null
+++ b/suite/chrome/common/bookmarks/editBookmarkOverlay.dtd
@@ -0,0 +1,25 @@
+<!ENTITY editBookmarkOverlay.name.label                      "Názov:">
+<!ENTITY editBookmarkOverlay.name.accesskey                  "N">
+<!ENTITY editBookmarkOverlay.location.label                  "Adresa:">
+<!ENTITY editBookmarkOverlay.location.accesskey              "A">
+<!ENTITY editBookmarkOverlay.feedLocation.label              "Adresa kanála:">
+<!ENTITY editBookmarkOverlay.feedLocation.accesskey          "d">
+<!ENTITY editBookmarkOverlay.siteLocation.label              "Adresa stránky:">
+<!ENTITY editBookmarkOverlay.siteLocation.accesskey          "s">
+<!ENTITY editBookmarkOverlay.liveTitlesSeparator.label       "Aktuálne titulky">
+<!ENTITY editBookmarkOverlay.folder.label                    "Priečinok:">
+<!ENTITY editBookmarkOverlay.foldersExpanderDown.tooltip     "Zobraziť všetky priečinky záložiek">
+<!ENTITY editBookmarkOverlay.expanderUp.tooltip              "Skryť">
+<!ENTITY editBookmarkOverlay.tags.label                      "Značky:">
+<!ENTITY editBookmarkOverlay.tags.accesskey                  "Z">
+<!ENTITY editBookmarkOverlay.tagsEmptyDesc.label             "Značky oddeľte čiarkami">
+<!ENTITY editBookmarkOverlay.description.label               "Popis:">
+<!ENTITY editBookmarkOverlay.description.accesskey           "P">
+<!ENTITY editBookmarkOverlay.keyword.label                   "Kľúčové slovo:">
+<!ENTITY editBookmarkOverlay.keyword.accesskey               "K">
+<!ENTITY editBookmarkOverlay.tagsExpanderDown.tooltip        "Zobraziť všetky značky">
+<!ENTITY editBookmarkOverlay.loadInSidebar.label             "Túto záložku načítať v bočnom paneli">
+<!ENTITY editBookmarkOverlay.loadInSidebar.accesskey         "b">
+<!ENTITY editBookmarkOverlay.choose.label                    "Vybrať…">
+<!ENTITY editBookmarkOverlay.newFolderButton.label           "Nový priečinok">
+<!ENTITY editBookmarkOverlay.newFolderButton.accesskey       "o">
deleted file mode 100644
--- a/suite/chrome/common/bookmarks/findBookmark.dtd
+++ /dev/null
@@ -1,17 +0,0 @@
-
-<!ENTITY search.name.label              "názov">
-<!ENTITY search.url.label               "umiestnenie">
-<!ENTITY search.shortcut.label          "kľúčové slovo">
-<!ENTITY search.description.label       "popis">
-<!ENTITY search.startswith.label        "začína s">
-<!ENTITY search.endswith.label          "končí s">
-<!ENTITY search.is.label                "je">
-<!ENTITY search.isnot.label             "nie je">
-<!ENTITY search.contains.label          "obsahuje">
-<!ENTITY search.doesntcontain.label     "neobsahuje">
-<!ENTITY save.query.label               "Uložiť hľadanie medzi záložky">
-<!ENTITY save.query.accesskey           "U">
-<!ENTITY search.for.label               "Hľadať záložky, ktorých">
-<!ENTITY findBookmark.title             "Hľadať záložky">
-<!ENTITY findButton.label               "Hľadať">
-<!ENTITY findButton.accesskey           "H">
new file mode 100644
--- /dev/null
+++ b/suite/chrome/common/bookmarks/moveBookmarks.dtd
@@ -0,0 +1,5 @@
+<!ENTITY window.title              "Zmena priečinka">
+<!ENTITY window.style              "width: 36em; height: 18em;">
+<!ENTITY moveTo.label              "Presunúť do:">
+<!ENTITY newFolderButton.label     "Nový priečinok">
+<!ENTITY newFolderButton.accesskey "N">
new file mode 100644
--- /dev/null
+++ b/suite/chrome/common/bookmarks/places.dtd
@@ -0,0 +1,108 @@
+<!ENTITY bookmarksManager.title         "Správca záložiek">
+<!ENTITY bookmarksManager.width         "760">
+<!ENTITY bookmarksManager.height        "500">
+
+<!ENTITY file.accesskey                     "S">
+<!ENTITY file.close.label                   "Zavrieť">
+<!ENTITY file.close.accesskey               "e">
+<!ENTITY cmd.close.key                      "w">
+<!ENTITY view.columns.label                 "Usporiadať stĺpce">
+<!ENTITY view.columns.accesskey             "U">
+<!ENTITY view.sort.label                    "Usporiadať">
+<!ENTITY view.sort.accesskey                "s">
+<!ENTITY view.unsorted.label                "Neusporiadané">
+<!ENTITY view.unsorted.accesskey            "e">
+<!ENTITY view.sortAscending.label           "Smer usporiadania A > Z">
+<!ENTITY view.sortAscending.accesskey       "A">
+<!ENTITY view.sortDescending.label          "Smer usporiadania Z > A">
+<!ENTITY view.sortDescending.accesskey      "Z">
+
+<!ENTITY cmd.findInBookmarks.label          "Hľadať v záložkách…">
+<!ENTITY cmd.findInBookmarks.accesskey      "H">
+<!ENTITY cmd.findCurrent.label              "Hľadať v aktuálnej kolekcii…">
+<!ENTITY cmd.findCurrent.accesskey          "a">
+
+<!ENTITY cmd.exportHTML.label               "Exportovať HTML…">
+<!ENTITY cmd.exportHTML.accesskey           "E">
+<!ENTITY cmd.importHTML.label               "Importovať HTML…">
+<!ENTITY cmd.importHTML.accesskey           "I">
+
+<!ENTITY cmd.backup.label                   "Zálohovať…">
+<!ENTITY cmd.backup.accesskey               "h">
+<!ENTITY cmd.restore2.label                 "Obnoviť">
+<!ENTITY cmd.restore2.accesskey             "b">
+<!ENTITY cmd.restoreFromFile.label          "Vybrať súbor…">
+<!ENTITY cmd.restoreFromFile.accesskey      "V">
+
+<!ENTITY cmd.bookmarkLink.label             "Pridať stránku medzi záložky…">
+<!ENTITY cmd.bookmarkLink.accesskey         "z">
+<!ENTITY cmd.delete.label                   "Odstrániť túto stránku">
+<!ENTITY cmd.delete.accesskey               "s">
+<!ENTITY cmd.deleteDomainData.label         "Zabudnúť na túto stránku">
+<!ENTITY cmd.deleteDomainData.accesskey     "b">
+
+<!ENTITY cmd.open.label                     "Otvoriť">
+<!ENTITY cmd.open.accesskey                 "t">
+<!ENTITY cmd.open_window.label              "Otvoriť v novom okne">
+<!ENTITY cmd.open_window.accesskey          "m">
+<!ENTITY cmd.open_tab.label                 "Otvoriť na novej karte">
+<!ENTITY cmd.open_tab.accesskey             "v">
+<!ENTITY cmd.open_all_in_tabs.label         "Otvoriť všetko na kartách">
+<!ENTITY cmd.open_all_in_tabs.accesskey     "c">
+
+<!ENTITY cmd.properties.label               "Vlastnosti">
+<!ENTITY cmd.properties.accesskey           "l">
+
+<!ENTITY cmd.sortby_name.label              "Usporiadať podľa názvu">
+<!ENTITY cmd.sortby_name.accesskey          "U">
+
+<!ENTITY cmd.new_bookmark.label             "Nová záložka…">
+<!ENTITY cmd.new_bookmark.accesskey         "N">
+<!ENTITY cmd.new_folder.label               "Nový priečinok…">
+<!ENTITY cmd.new_folder.accesskey           "r">
+<!ENTITY cmd.context_new_folder.accesskey   "r">
+<!ENTITY cmd.new_separator.label            "Nový oddeľovač">
+<!ENTITY cmd.new_separator.accesskey        "d">
+
+<!ENTITY cmd.reloadLivebookmark.label       "Obnoviť aktívnu záložku">
+<!ENTITY cmd.reloadLivebookmark.accesskey   "a">
+<!ENTITY cmd.reloadMicrosummary.label       "Obnoviť aktuálny titulok">
+<!ENTITY cmd.reloadMicrosummary.accesskey   "t">
+
+<!ENTITY cmd.moveBookmarks.label            "Presunúť…">
+<!ENTITY cmd.moveBookmarks.accesskey        "u">
+
+<!ENTITY col.name.label                     "Názov">
+<!ENTITY col.tags.label                     "Značky">
+<!ENTITY col.url.label                      "Adresa">
+<!ENTITY col.lastvisit.label                "Dátum poslednej návštevy">
+<!ENTITY col.visitcount.label               "Počet návštev">
+<!ENTITY col.keyword.label                  "Kľúčové slovo">
+<!ENTITY col.description.label              "Popis">
+<!ENTITY col.dateadded.label                "Pridané">
+<!ENTITY col.lastmodified.label             "Posledná úprava">
+
+<!ENTITY search.label                       "Prehľadávať:">
+<!ENTITY search.accesskey                   "e">
+<!ENTITY search.scopeFolder.label           "Označený priečinok">
+<!ENTITY search.scopeFolder.accesskey       "a">
+<!ENTITY search.scopeBookmarks.label        "Záložky">
+<!ENTITY search.scopeBookmarks.accesskey    "Z">
+<!ENTITY saveSearch.label                   "Uložiť">
+<!ENTITY saveSearch.accesskey               "U">
+
+<!ENTITY cmd.find.key                       "f">
+
+<!ENTITY backButton.tooltip                 "Prejsť naspäť">
+<!ENTITY forwardButton.tooltip              "Prejsť dopredu">
+
+<!ENTITY detailsPane.more.label             "Viac">
+<!ENTITY detailsPane.more.accesskey         "V">
+<!ENTITY detailsPane.less.label             "Menej">
+<!ENTITY detailsPane.less.accesskey         "M">
+<!ENTITY detailsPane.selectAnItemText.description "Vyberte položku, ktorej vlastnosti chcete zobraziť alebo upraviť">
+
+<!ENTITY editBookmark.done.label "Hotovo">
+<!ENTITY editBookmark.cancel.label "Zrušiť">
+<!ENTITY editBookmark.removeBookmark.accessKey "d">
+
deleted file mode 100644
--- a/suite/chrome/common/bookmarks/sortFolder.dtd
+++ /dev/null
@@ -1,24 +0,0 @@
-<!ENTITY window.title "Usporiadanie priečinka">
-
-<!ENTITY sortOptions.label "Možnosti usporiadania">
-<!ENTITY description.label "&brandShortName; môže usporiadať jednotlivé priečinky. Usporiadanie tohto priečinka môžete upraviť pomocou týchto nastavení.">
-
-<!ENTITY sortBy.label "Usporiadať podľa:">
-<!ENTITY sortBy.accesskey "U">
-<!ENTITY sortBy.name.label "Názov">
-<!ENTITY sortBy.url.label "Umiestnenie">
-<!ENTITY sortBy.shortcutUrl.label "Kľúčové slovo">
-<!ENTITY sortBy.description.label "Popis">
-<!ENTITY sortBy.bookmarkAddDate.label "Dátum pridania">
-<!ENTITY sortBy.lastModifiedDate.label "Naposledy upravené">
-<!ENTITY sortBy.lastVisitDate.label "Naposledy navštívené">
-
-<!ENTITY sortOrder.label "Smer usporiadania:">
-<!ENTITY sortOrder.accesskey "m">
-<!ENTITY sortAscending.label "Vzostupne">
-<!ENTITY sortDescending.label "Zostupne">
-
-<!ENTITY sortFoldersFirst.label "Usporiadať najskôr priečinky">
-<!ENTITY sortFoldersFirst.accesskey "n">
-<!ENTITY sortRecursively.label "Usporiadať rekurzívne">
-<!ENTITY sortRecursively.accesskey "o">
--- a/suite/chrome/common/feeds/subscribe.dtd
+++ b/suite/chrome/common/feeds/subscribe.dtd
@@ -1,3 +1,4 @@
 <!ENTITY feedPage.title "Čítanie kanála">
 <!ENTITY feedSubscribeNow "Odoberať">
 <!ENTITY feedMessenger "Novinky a blogy">
+<!ENTITY feedLiveBookmarks "Aktívne záložky">
--- a/suite/chrome/common/help/cs_nav_prefs_navigator.xhtml
+++ b/suite/chrome/common/help/cs_nav_prefs_navigator.xhtml
@@ -29,16 +29,17 @@
   <ul>
     <li><a href="#navigator">Browser</a></li>
     <li><a href="#history">History</a></li>
     <li><a href="#languages">Languages</a></li>
     <li><a href="#helper_applications">Helper Applications</a></li>
     <li><a href="#location_bar">Location Bar</a></li>
     <li><a href="#internet_search">Internet Search</a></li>
     <li><a href="#tabbed_browsing">Tabbed Browsing</a></li>
+    <li><a href="#link_behavior">Link Behavior</a></li>
     <li><a href="#downloads">Downloads</a></li>
   </ul>
 </div>
 
 <h2 id="navigator">Browser Preferences - Browser</h2>
 
 <p>This section describes how to use the main browser preferences panel. If
   you&apos;re not already viewing it, follow these steps:</p>
@@ -480,60 +481,80 @@
         <kbd class="mac">Cmd</kbd><kbd class="noMac">Ctrl</kbd>+<kbd
         class="mac">Return</kbd><kbd class="noMac">Enter</kbd> in the Location
         bar</strong>: Select this to open a Web page in a new tab when you type
         the URL of the page in the Location Bar and press
         <kbd class="mac">Cmd</kbd><kbd class="noMac">Ctrl</kbd>+<kbd
         class="mac">Return</kbd><kbd class="noMac">Enter</kbd>.</li>
     </ul>
   </li>
+</ul>
+
+<p>[<a href="#navigator_preferences">Return to beginning of section</a>]</p>
+
+<h2 id="link_behavior">Browser Preferences - Link Behavior</h2>
+
+<p>This section describes how to use the Link Behavior preferences panel. If
+  you&apos;re not already viewing it, follow these steps:</p>
+
+<ol>
+  <li>Open the <span class="mac">&brandShortName;</span>
+    <span class="noMac">Edit</span> menu and choose Preferences.</li>
+  <li>Under the Browser category, click Link Behavior. (If no subcategories
+    are visible, double-click Browser to expand the list.)</li>
+</ol>
+
+<p>The Link Behavior preferences panel allows you to configure how links are
+  opened in &brandShortName;:</p>
+
+<ul>
   <li><strong>Link open behavior</strong>: If a webpage is designed so that
     certain links open in a new window by default (either through the target
     attribute in HTML or through embedded JavaScript), you may want to
     override this:
     <ul>
       <li><strong>The current tab/window</strong>: Open the linked page in the
         current tab of the active window.</li>
       <li><strong>A new tab in the current window</strong>: Open the linked
         page in a new tab instead of a new window.</li>
       <li><strong>A new window</strong>: Open the linked page in a new window.
-        (This is the default and does not override the webpage design).</li>
+        (This is the default and does not override the webpage design.)</li>
     </ul>
   </li>
   <li><strong>Links from other applications</strong>: If &brandShortName; is
     called from another application with a webpage address as an argument (like
     a click on a link in an external email program), you can control where the
     page will be loaded:
     <ul>
       <li><strong>The current tab/window</strong>: Open the linked page in the
         current tab of the active window.</li>
       <li><strong>A new tab in the current window</strong>: Open the linked
         page in a new tab instead of a new window.</li>
       <li><strong>A new window</strong>: Open the linked page in a new window.
-        (This is the default).</li>
+        (This is the default.)</li>
     </ul>
   </li>
 </ul>
 
 <div class="win">
   <p>To ensure that &brandShortName; opens a new window, select the Browser
-    option in <a href= "cs_nav_prefs_appearance.xhtml#appearance">Appearance
+    option in <a href="cs_nav_prefs_appearance.xhtml#appearance">Appearance
     Preferences - Appearance</a>.</p>
 
   <p>If you want &brandShortName; to open a new tab instead of a new window when
     you launch it and it is already running, ensure the following:</p>
 
   <ul>
-    <li>If you launch &brandShortName; by command line, do not use command-line
-      parameters that open windows.</li>
-    <li>Nothing is set in the
-      <a href= "cs_nav_prefs_appearance.xhtml#appearance">Appearance Preferences
+    <li>If &brandShortName; is launched from the command line, no command line
+      parameters that open windows (like <kbd>-new-window</kbd>) are used.</li>
+    <li>No <q>When &brandShortName; starts up, open</q> option is set in
+      <a href="cs_nav_prefs_appearance.xhtml#appearance">Appearance Preferences
       - Appearance</a>.</li>
-    <li>Set <q>Links from other applications</q> preference to <q>A new tab in
-      the current window</q>.</li>
+    <li>The <q>Links from other applications</q> preference is set to <q>A new
+      tab in the current window</q>.</li>
   </ul>
 </div>
 
 <p>[<a href="#navigator_preferences">Return to beginning of section</a>]</p>
 
 <h2 id="downloads">Browser Preferences - Downloads</h2>
 
 <p>This section describes how to use the Downloads preferences panel. If
--- a/suite/chrome/common/help/help-index1.rdf
+++ b/suite/chrome/common/help/help-index1.rdf
@@ -1295,17 +1295,17 @@
      <rdf:li>
        <rdf:Description ID="Mail_and_Newsgroups:viewing_attachments"
          nc:name="zobrazenie príloh"
          nc:link="mail_help.xhtml#viewing_and_opening_attachments"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="Mail_and_Newsgroups:working_offline"
          nc:name="práca v režime offline"
-         nc:link="mail_help.xhtml#working_offline"/>
+         nc:link="mailnews_offline.xhtml#working_offline"/>
      </rdf:li></rdf:Seq>
    </nc:subheadings>
 </rdf:Description>
 
 <rdf:Description about="#master_password">
    <nc:subheadings>
      <rdf:Seq><rdf:li>
        <rdf:Description ID="master_password:changing"
@@ -1384,17 +1384,17 @@
      <rdf:Seq><rdf:li>
        <rdf:Description ID="Offline:general_preferences"
          nc:name="nastavenia režimu offline"
          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"/>
+         nc:link="mailnews_offline.xhtml#working_offline"/>
      </rdf:li></rdf:Seq>
    </nc:subheadings>
 </rdf:Description>
 
 <rdf:Description about="help-indexAZ.rdf#p">
    <nc:subheadings>
      <rdf:Seq><rdf:li>
        <rdf:Description ID="page_info"
@@ -1612,16 +1612,21 @@
          nc:link="cs_nav_prefs_advanced.xhtml#keyboard_navigation"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="preferences:languages"
          nc:name="nastavenia jazykov"
          nc:link="cs_nav_prefs_navigator.xhtml#languages"/>
      </rdf:li>
      <rdf:li>
+       <rdf:Description ID="preferences:Link_Behavior"
+         nc:name="nastavenia správania sa odkazov"
+         nc:link="cs_nav_prefs_navigator.xhtml#link_behavior"/>
+     </rdf:li>
+     <rdf:li>
        <rdf:Description ID="preferences:Navigator"
          nc:name="nastavenia prehliadača"
          nc:link="cs_nav_prefs_navigator.xhtml#navigator_preferences"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="preferences:passwords"
          nc:name="nastavenia hesiel"
          nc:link="passwords_help.xhtml#passwords"/>
@@ -1642,21 +1647,16 @@
          nc:link="cs_nav_prefs_advanced.xhtml#proxies"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="preferences:security"
          nc:name="bezpečnostné nastavenia"
          nc:link="privsec_help.xhtml"/>
      </rdf:li>
      <rdf:li>
-       <rdf:Description ID="preferences:smart_browsing"
-         nc:name="nastavenia inteligentného prehliadania"
-         nc:link="cs_nav_prefs_navigator.xhtml#smart_browsing"/>
-     </rdf:li>
-     <rdf:li>
        <rdf:Description ID="preferences:SSL"
          nc:name="nastavenia SSL"
          nc:link="ssl_help.xhtml#privacy_and_security_preferences_ssl"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="preferences:Tabbed_Browsing"
          nc:name="nastavenia prehliadania na kartách"
          nc:link="cs_nav_prefs_navigator.xhtml#tabbed_browsing"/>
@@ -2203,17 +2203,17 @@
    <nc:subheadings>
      <rdf:Seq><rdf:li>
        <rdf:Description ID="web_pages"
          nc:name="webové stránky"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="Working_Offline"
          nc:name="Režim Offline"
-         nc:link="mail_help.xhtml#working_offline"/>
+         nc:link="mailnews_offline.xhtml#working_offline"/>
      </rdf:li></rdf:Seq>
    </nc:subheadings>
 </rdf:Description>
 
 <rdf:Description about="#web_pages">
    <nc:subheadings>
      <rdf:Seq><rdf:li>
        <rdf:Description ID="web_pages:copying"
--- a/suite/chrome/common/help/help-win.rdf
+++ b/suite/chrome/common/help/help-win.rdf
@@ -107,19 +107,9 @@
      <rdf:Seq><rdf:li>
        <rdf:Description ID="preferences:default_browser"
          nc:name="nastavenie predvoleného prehliadača"
 	 nc:link="cs_nav_prefs_navigator.xhtml#navigator"/>
      </rdf:li></rdf:Seq>
    </nc:subheadings>
 </rdf:Description>
 
-<rdf:Description about="help-indexAZ.rdf#s">
-   <nc:subheadings>
-     <rdf:Seq><rdf:li>
-       <rdf:Description ID="System"
-         nc:name="Systémové nastavenia"
-	 nc:link="cs_nav_prefs_advanced.xhtml#system"/>
-     </rdf:li></rdf:Seq>
-   </nc:subheadings>
-</rdf:Description>
-
 </rdf:RDF>
--- a/suite/chrome/common/help/mail_help.xhtml
+++ b/suite/chrome/common/help/mail_help.xhtml
@@ -61,17 +61,17 @@
     <li><a href="#organizing_your_messages">Organizing Your Messages</a></li>
     <li><a href="#controlling_junk_mail">Controlling Junk Mail</a></li>
     <li><a href="#importing_mail_from_other_programs">Importing Mail from Other
       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="mailnews_offline.xhtml">Working Offline</a></li>
     <li><a href="mail_sec_help.xhtml">Signing &amp; Encrypting
       Messages</a></li>
     <li><a href="mailnews_account_settings.xhtml">Mail &amp; Newsgroups
       Account Settings</a></li>
     <li><a href="mailnews_preferences.xhtml">Mail &amp; Newsgroups
       Preferences</a></li>
   </ul>
 </div>
@@ -301,17 +301,18 @@
         &amp; Storage Settings (IMAP)</a> or
         <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="mailnews_account_settings.xhtml#disk_space_settings_pop">Disk
-        Space Settings (POP)</a> or <a href="#disk_space_settings_blog">Disk
+        Space Settings (POP)</a> or
+        <a href="mailnews_account_settings.xhtml#disk_space_settings_blogs">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
@@ -1976,17 +1977,17 @@
   <li>In the LDAP Directory Servers dialog box, select the directory that you
     want to delete and click Delete.</li>
   <li>Click OK, then click OK again to close the Preferences dialog box.</li>
 </ol>
 
 <p>For information on downloading or synchronizing a directory for offline use
   so that you can search it or use it for address book autocompletion while
   working offline, see
-  <a href="#downloading_directory_entries_for_offline_use">Downloading
+  <a href="mailnews_offline.xhtml#downloading_directory_entries_for_offline_use">Downloading
   Directory Entries for Offline Use</a>.</p>
 
 <h3 id="directory_server_settings">Directory Server Settings</h3>
 
 <p>If you are not already viewing the Directory Server Settings dialog box,
   begin from the Mail window:</p>
 
 <ol>
@@ -2366,17 +2367,17 @@
     <td colspan="2"><img src="images/mail_read_column.png" alt=""/></td>
   </tr>
   <tr>
     <td><strong>Read column</strong></td>
   </tr>
 </table>
 
 <p>You can flag messages that you later want to download for
-  <a href="#downloading_selected_or_flagged_messages_for_offline_use">offline
+  <a href="mailnews_offline.xhtml#downloading_selected_or_flagged_messages_for_offline_use">offline
   use</a>.</p>
 
 <p>To flag messages, begin from the Mail window:</p>
 
 <ol>
   <li>Select a Mail or Newsgroup folder to display its messages.</li>
   <li>Click in the Flag column of each message you want to download. A flag
     <img src="images/mail_flag.png" alt=""/> appears where you clicked to
@@ -3445,484 +3446,10 @@ to filter unwanted mail, and how phishin
     downloads articles/items.</li>
 </ul>
 
 <p><strong>Note</strong>: Remember that moving the feed doesn&apos;t move
   existing articles from the folder in which they have been
   downloaded.</p>
 
 <p>[<a href="#organizing_your_feeds">Return to beginning of section</a>]</p>
-
-<h1 id="working_offline">Working Offline</h1>
-
-<div class="contentsBox">In this section:
-  <ul>
-    <li><a href="#setting_up_mozilla_mail_and_newsgroups_to_work_offline">Setting
-      Up &brandShortName; Mail &amp; Newsgroups to Work Offline</a></li>
-    <li><a href="#downloading_all_messages_for_offline_use">Downloading All
-      Messages for Offline Use</a></li>
-    <li><a href="#downloading_an_individual_folder_for_offline_use">Downloading
-      an Individual Folder for Offline Use</a></li>
-    <li><a href="#downloading_selected_or_flagged_messages_for_offline_use">Downloading
-      Selected or Flagged Messages for Offline Use</a></li>
-    <li><a href="#downloading_directory_entries_for_offline_use">Downloading
-      Directory Entries for Offline Use</a></li>
-    <li><a href="#setting_up_your_accounts_for_working_offline">Setting Up Your
-      Accounts for Working Offline</a></li>
-    <li><a href="#selecting_items_for_offline_viewing">Selecting Items for
-      Offline Viewing</a></li>
-    <li><a href="#downloading_and_synchronizing_your_messages">Downloading and
-      Synchronizing Your Messages</a></li>
-    <li><a href="#working_offline_and_reconnecting_later">Working Offline and
-      Reconnecting Later</a></li>
-  </ul>
-</div>
-
-<h2 id="setting_up_mozilla_mail_and_newsgroups_to_work_offline">Setting Up
-  &brandShortName; Mail &amp; Newsgroups to Work Offline</h2>
-
-<p>&brandShortName; Mail &amp; Newsgroups&apos; offline feature lets you
-  download your mail and read it offline (while disconnected from the
-  Internet). If you use a dial-up (modem) connection to access your mail and
-  you want to reduce the time you are connected, or, if you need to temporarily
-  disconnect from your company&apos;s network while traveling or switching
-  locations, you can download your mail so that you can read it offline. The
-  offline feature can automatically download incoming messages and then later
-  send all your outgoing messages when you reconnect.</p>
-
-<p>Note that for POP accounts your mail is already downloaded by default, so
-  most of these offline features aren&apos;t relevant for POP accounts.</p>
-
-<p>If you occasionally want to work offline, &brandShortName; Mail &amp;
-  Newsgroups lets you easily:</p>
-
-<ul>
-  <li>Download your Inbox for offline use.</li>
-  <li>Download an individual folder for offline use.</li>
-  <li>Download only selected or flagged messages for offline use.</li>
-  <li>Download directory entries in your address book for offline use.</li>
-</ul>
-
-<p>If you frequently work offline, &brandShortName; Mail &amp; Newsgroups also
-  lets you:</p>
-
-<ul>
-  <li>Set up one or more of your accounts for offline use.</li>
-  <li>Set offline and disk space preferences for each account.</li>
-  <li>Select the folders and newsgroups that you want to view offline.</li>
-</ul>
-
-<p>[<a href="#working_offline">Return to beginning of section</a>]</p>
-
-<h2 id="downloading_all_messages_for_offline_use">Downloading All Messages for
-  Offline Use</h2>
-
-<p>You can tell &brandShortName; Mail &amp; Newsgroups to automatically
-  download your messages for offline use. Later, when you go back online,
-  &brandShortName; Mail &amp; Newsgroups automatically synchronizes your
-  messages with the server.</p>
-
-<p>Note that the Inbox for POP accounts is downloaded by default, so this
-  section does not apply for POP accounts.</p>
-
-<p>To automatically download your messages for offline use, 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>In the left side of the dialog box, under the name of the account you
-    want to use offline, select Synchronization &amp; Storage. (This category
-    is not available for POP accounts.)</li>
-  <li>Check the box labeled <q>Keep messages for this account on this
-    computer</q>.</li>
-  <li>Click OK.</li>
-  <li>Click the Online/Offline indicator <img src="images/online.png" alt=""/>
-    in the lower right corner of the Mail window (to the left of the Cookie
-    icon) to go offline. You will be asked to download messages for them to be
-    available while offline. Click on <q>Download</q> to proceed.</li>
-</ol>
-
-<p><strong>Note</strong>: This setting also applies to any new folders
-  created. While the per-account setting can be overridden for an
-  <a href="#downloading_an_individual_folder_for_offline_use">individual
-  folder</a>, those per-folder settings are <em>removed</em> when the
-  <q>Keep messages</q> box is toggled.</p>
-
-<p>&brandShortName; Mail &amp; Newsgroups automatically downloads all messages
-  in your Inbox so you can read and respond to them while working offline.
-  After disconnecting, &brandShortName; Mail &amp; Newsgroups remains open so
-  you can continue to work with your messages.</p>
-
-<p>To reconnect to the Internet so you can work online:</p>
-
-<ul>
-  <li>Click the Online/Offline indicator <img src="images/offline.png"
-    alt=""/> in the lower right corner of the Mail window (to the left of the
-    Cookie icon) to go back online.</li>
-</ul>
-
-<p>When you go back online, &brandShortName; Mail &amp; Newsgroups
-  automatically synchronizes your Inbox messages with the server, by
-  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="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>
-
-<p>To download a specific folder for offline use, begin from the Mail
-  window:</p>
-
-<ol>
-  <li>In the left side of the Mail window, select the folder that you want to
-    download for offline use.</li>
-  <li>Open the Edit menu, and choose Folder Properties. You see the Properties
-    dialog box.</li>
-  <li>Click the Synchronization tab.</li>
-  <li>Check <q>Select this folder for offline use</q>.</li>
-  <li>Click Download Now if you want to immediately begin downloading the
-    folder&apos;s messages. Alternatively, you can continue working, and when
-    you are ready to go offline, proceed to the next step.</li>
-  <li>Click the Online/Offline indicator <img src="images/online.png" alt=""/>
-    in the lower right corner of the Mail window to go offline.</li>
-  <li>In the Work Offline dialog box, click Download.</li>
-</ol>
-
-<p>&brandShortName; Mail &amp; Newsgroups automatically downloads all messages
-  in the selected folder so you can read and respond to them while working
-  offline. After disconnecting, &brandShortName; Mail &amp; Newsgroups remains
-  open so you can continue to work with your messages.</p>
-
-<p><strong>Note</strong>: Message headers that have been downloaded for reading
-  offline display a darker gray envelope or newsgroup icon.</p>
-
-<p>To reconnect to the Internet so you can work online:</p>
-
-<ul>
-  <li>Click the Online/Offline indicator <img src="images/offline.png"
-    alt=""/> in the lower right corner of the Mail window (to the left of the
-    Cookie icon) to go back online.</li>
-</ul>
-
-<p>&brandShortName; Mail &amp; Newsgroups automatically synchronizes the
-  offline folders with the server, by replicating any changes you made while
-  working offline.</p>
-
-<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="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
-  you have enabled the <q>Fetch headers only</q> setting in the POP account
-  settings, then only the headers will be downloaded, and you will need to use
-  the commands in this section to download the complete messages.</p>
-
-<p>To download selected messages for offline use, begin from the Mail
-  window:</p>
-
-<ol>
-  <li>Select a Mail or Newsgroup folder to display its messages.</li>
-  <li>Select the messages you want to download, as follows:
-    <ul>
-      <li>To select a group of adjacent messages, click the first message, and
-        then Shift-click to select the last message in the group.</li>
-      <li>To select messages anywhere in the message list, hold down the
-        <kbd class="mac">Cmd</kbd><kbd class="noMac">Ctrl</kbd> key and click
-        each message.</li>
-    </ul>
-  </li>
-  <li>Open the File menu, choose Offline, and then choose Get Selected Messages
-    from the submenu. &brandShortName; Mail &amp; Newsgroups downloads the
-    selected messages.</li>
-</ol>
-
-<p>To download flagged messages for offline use, begin from the Mail
-  window:</p>
-
-<ol>
-  <li>Select a Mail or Newsgroup folder to display its messages.</li>
-  <li>Click in the flag column of each message you want to download. A flag
-    appears where you clicked to indicate that the message has been marked. If
-    the flag column is not visible, click the Show/Hide Columns icon
-    <img src="images/columns.png" alt=""/> and select Flag from the list.</li>
-  <li>Open the File menu, choose Offline, and then choose Get Flagged Messages.
-    &brandShortName; Mail &amp; Newsgroups downloads the flagged messages.</li>
-</ol>
-
-<p>Once downloading is complete, click the Online/Offline indicator in the
-  lower right corner of the Mail window (to the left of the Cookie icon) to go
-  offline. After you disconnect, &brandShortName; Mail &amp; Newsgroups remains
-  open so you can continue to work with your messages.</p>
-
-<p>Note that the <q>Get Selected Messages</q> and <q>Get Flagged Messages</q>
-  menu items are also available in the pop-up thread context menu, for faster
-  access.</p>
-
-<p><strong>Note</strong>: Message headers that have been downloaded for reading
-  offline display a darker gray envelope or newsgroup icon.</p>
-
-<p>To reconnect to the Internet so you can work online:</p>
-
-<ul>
-  <li>Click the Online/Offline indicator <img src="images/offline.png"
-    alt=""/> in the lower right corner of the Mail window to go online.</li>
-</ul>
-
-<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="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
-  computer so that they are available when you work offline. Once you&apos;ve
-  downloaded directory entries, you can use the same procedure to update your
-  local copy of the entries with the latest entries on the directory
-  server.</p>
-
-<p>To download or update an address book LDAP directory for offline use:</p>
-
-<ol>
-  <li>Make sure you&apos;re online.</li>
-  <li>Open the Window menu, and choose Address Book.</li>
-  <li>In the Address Book window, select the directory that you want to
-    download (replicate).</li>
-  <li>Click Properties in the Address Book toolbar. The Directory Server
-    Properties dialog box appears.</li>
-  <li>Click the Offline tab.</li>
-  <li>Click Download Now to start copying the entries to your computer.</li>
-  <li>If prompted, enter your network user name and password, and click OK to
-    start the download.
-
-    <p>Depending on the number of directory entries, the download process may
-      take a while, so please be patient.</p>
-  </li>
-</ol>
-
-<p>After the download finishes, you can work offline and search the directory
-  or use it for address autocompletion when composing messages. After
-  you&apos;ve been using your local copy of the directory for a while, you may
-  wish to update it to get the latest entries from the directory server. To
-  update your local copy, use the procedure described above.</p>
-
-<p>[<a href="#working_offline">Return to beginning of section</a>]</p>
-
-<h2 id="setting_up_your_accounts_for_working_offline">Setting Up Your Accounts
-  for Working Offline</h2>
-
-<p>To set up one or more accounts for working offline, you use the Offline and
-  Disk Space preferences in the Mail &amp; Newsgroups Account Settings dialog
-  box. Once set, you don&apos;t need to change these preferences each time you
-  want to work offline. The offline and disk space preferences you can set for
-  an account depend on the type of account (IMAP, POP, or Newsgroup).</p>
-
-<p>Here&apos;s a summary of the steps you will follow to set up your accounts
-  for offline use:</p>
-
-<ol>
-  <li>For each account that you want to work with while offline, use the Mail
-    &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="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>
-  <li>Select the type of messages (mail or newsgroup or both) that you want to
-    download.
-
-    <p><strong>Important</strong>: You must select at least one category (mail
-      messages or newsgroup messages) in order for the download to work.</p>
-  </li>
-  <li>Select <q>Work offline once download and/or sync is complete</q>.</li>
-  <li>Click OK to download the selected items and then go offline. See
-    <a href="#downloading_and_synchronizing_your_messages">Downloading and
-    Synchronizing Your Messages</a> for more information.</li>
-</ol>
-
-<p>For subsequent offline sessions, you can skip step 1.</p>
-
-<p>[<a href="#working_offline">Return to beginning of section</a>]</p>
-
-<h2 id="selecting_items_for_offline_viewing">Selecting Items for Offline
-  Viewing</h2>
-
-<p>Before you can read mail and newsgroup messages while offline, you must
-  first select them for downloading. You can set up an entire account for
-  offline use. You can also choose which folders and newsgroups that you
-  want to use offline.</p>
-
-<p><strong>Note</strong>: Keep in mind that selecting more items may increase
-  download time and disk space used.</p>
-
-<p>To select accounts, folders, and newsgroups for offline viewing, 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>Choose the Synchronization &amp; Storage category for the account you
-    want to change.</li>
-  <li>Click <q>Advanced</q> to see your IMAP folders, or <q>Select newsgroups
-    for offline use</q> for your subscribed newsgroups.
-
-    <p><strong>Note</strong>: You see only the newsgroups and folders that
-      you&apos;ve already <a href="#subscribing_to_newsgroups">subscribed</a>
-      to. POP accounts and local mail folders don&apos;t appear in the
-      list.</p>
-  </li>
-  <li>Select the items (folders, newsgroups) that you want to make available
-    for offline use.</li>
-  <li>Click OK.</li>
-</ol>
-
-<p>Once set, you don&apos;t need to change these settings each time you want to
-  go offline. However, if you do want to change them, you can easily do so
-  before going offline, since the same Select button is available when using
-  the <a href="#downloading_and_synchronizing_your_messages">Download and
-  Sync</a> command.</p>
-
-<p>[<a href="#working_offline">Return to beginning of section</a>]</p>
-
-<h2 id="downloading_and_synchronizing_your_messages">Downloading and
-  Synchronizing Your Messages</h2>
-
-<p>If you have already selected mail folders and newsgroups for offline use,
-  you are now ready to download and synchronize them. If you haven&apos;t yet
-  selected items to download, you can choose them before you go offline.</p>
-
-<p>If you are not already viewing the Download/Sync Now dialog box, follow
-  these steps:</p>
-
-<p>To download and synchronize your messages, begin from the Mail
- window:</p>
-
-<ol>
-  <li>Open the File menu, choose Offline, and then choose Download/Sync
-    Now.</li>
-  <li>Select the categories (mail messages or newsgroup messages) that you want
-    to download.
-
-    <p><strong>Important</strong>: You must select at least one category (Mail
-      messages, Newsgroup messages) in order for the download to work. If the
-      checkboxes are disabled, it means that you haven&apos;t yet selected
-      items to download. Use the Select button to select items to download.</p>
-  </li>
-  <li>To send messages in your Unsent Messages folder before going offline,
-    check <q>Send Unsent Messages</q>.</li>
-  <li>To go offline immediately after &brandShortName; Mail &amp; Newsgroups
-    finishes downloading, select <q>Work offline once download and/or sync is
-    complete</q>.</li>
-  <li>To set or change the items to download, click Select. See
-    <a href="#selecting_items_for_offline_viewing">Selecting Items for Offline
-    Viewing</a> for more information. You can skip this step if you&apos;ve
-    already selected items for download.</li>
-  <li>Click OK. &brandShortName; Mail &amp; Newsgroups begins downloading the
-    selected items.</li>
-</ol>
-
-<p>If you chose to work offline once the download completes, then
-  &brandShortName; Mail &amp; Newsgroups immediately switches to offline mode.
-  Otherwise, when you are ready to go offline, click the Online/Offline
-  indicator <img src="images/online.png" alt=""/> in the lower right corner of
-  the Mail window to go offline.</p>
-
-<p>[<a href="#working_offline">Return to beginning of section</a>]</p>
-
-<h2 id="working_offline_and_reconnecting_later">Working Offline and
-  Reconnecting Later</h2>
-
-<p>To work offline and reconnect later, begin from the Mail window.</p>
-
-<p>When you are ready to work offline:</p>
-
-<ol>
-  <li>Click the online/offline indicator <img src="images/online.png" alt=""/>
-    in the lower-right corner of the Mail window. Mail &amp; Newsgroups prompts
-    you to download messages, if you want, before going offline.</li>
-  <li>Click Download to download messages before going offline. If you want to
-    work offline without downloading messages, click Don&apos;t Download.</li>
-</ol>
-
-<p><strong>Note</strong>: Message headers that have been downloaded for reading
-  offline display a darker gray envelope or newsgroup icon.</p>
-
-<p><strong>Tip</strong>: To set &brandShortName; Mail &amp; Newsgroups&apos;
-  download behavior when going offline, open the
-  <span class="mac">&brandShortName;</span> <span class="noMac">Edit</span>
-  menu, choose Preferences, and then under the Mail &amp; Newsgroups category,
-  select Network &amp; Storage (if no subcategories are visible, double-click
-  Mail &amp; Newsgroups to expand the list). You can choose to have
-  &brandShortName; Mail &amp; Newsgroups prompt you to download messages when
-  going offline, to automatically download messages, or to not download any
-  messages.</p>
-
-<p>To reconnect and synchronize your messages:</p>
-
-<ol>
-  <li>Click the online/offline indicator <img src="images/offline.png"
-    alt=""/> in the lower-right corner of any &brandShortName; window.</li>
-  <li>Open the File menu, choose Offline, and then choose Download/Sync
-    Now.</li>
-</ol>
-
-<p>&brandShortName; Mail &amp; Newsgroups synchronizes your messages with the
-  server by replicating any changes you made while working offline.</p>
-
-<p><strong>Tip</strong>: To set &brandShortName; Mail &amp; Newsgroups&apos;
-  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>
 </body>
 </html>
new file mode 100644
--- /dev/null
+++ b/suite/chrome/common/help/mailnews_account_settings.xhtml
@@ -0,0 +1,1095 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
+  "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"[
+  <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" >
+  %brandDTD;
+]>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Mail &amp; Newsgroups Account Settings</title>
+<link rel="stylesheet" href="helpFileLayout.css" type="text/css"/>
+<link rel="stylesheet" href="chrome://communicator/skin/smileys.css"
+      type="text/css"/>
+</head>
+<body>
+
+<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="mail_help.xhtml#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="mailnews_preferences.xhtml#composition">forwarding inline</a>.</li>
+</ul>
+
+<p>You use Addressing settings to override the global LDAP server settings
+  specified for all <a
+  href="mailnews_preferences.xhtml#addressing_preferences">address books</a> in
+  the Preferences dialog box. LDAP server settings affect the behavior of
+  <a href="mailnews_preferences.xhtml#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="mail_help.xhtml#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="mailnews_offline.xhtml#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="mailnews_offline.xhtml#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="mailnews_preferences.xhtml#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="mailnews_preferences.xhtml#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="mailnews_preferences.xhtml#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="mail_help.xhtml#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>
+</body>
+</html>
new file mode 100644
--- /dev/null
+++ b/suite/chrome/common/help/mailnews_offline.xhtml
@@ -0,0 +1,500 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
+  "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"[
+  <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" >
+  %brandDTD;
+]>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Working Offline</title>
+<link rel="stylesheet" href="helpFileLayout.css" type="text/css"/>
+<link rel="stylesheet" href="chrome://communicator/skin/smileys.css"
+      type="text/css"/>
+</head>
+<body>
+
+<h1 id="working_offline">Working Offline</h1>
+
+<p>&brandShortName; Mail &amp; Newsgroups includes advanced features to help
+  you manage your messaging needs when you are not connected to the Internet.
+  You can download mail and news messages before going offline for later
+  reading, and you can defer sending mail messages and newsgroup posts until
+  you get back online. All of these features are explained in this
+  document.</p>
+
+<div class="contentsBox">In this section:
+  <ul>
+    <li><a href="#setting_up_mozilla_mail_and_newsgroups_to_work_offline">Setting
+      Up &brandShortName; Mail &amp; Newsgroups to Work Offline</a></li>
+    <li><a href="#downloading_all_messages_for_offline_use">Downloading All
+      Messages for Offline Use</a></li>
+    <li><a href="#downloading_an_individual_folder_for_offline_use">Downloading
+      an Individual Folder for Offline Use</a></li>
+    <li><a href="#downloading_selected_or_flagged_messages_for_offline_use">Downloading
+      Selected or Flagged Messages for Offline Use</a></li>
+    <li><a href="#downloading_directory_entries_for_offline_use">Downloading
+      Directory Entries for Offline Use</a></li>
+    <li><a href="#setting_up_your_accounts_for_working_offline">Setting Up Your
+      Accounts for Working Offline</a></li>
+    <li><a href="#selecting_items_for_offline_viewing">Selecting Items for
+      Offline Viewing</a></li>
+    <li><a href="#downloading_and_synchronizing_your_messages">Downloading and
+      Synchronizing Your Messages</a></li>
+    <li><a href="#working_offline_and_reconnecting_later">Working Offline and
+      Reconnecting Later</a></li>
+  </ul>
+</div>
+
+<h2 id="setting_up_mozilla_mail_and_newsgroups_to_work_offline">Setting Up
+  &brandShortName; Mail &amp; Newsgroups to Work Offline</h2>
+
+<p>&brandShortName; Mail &amp; Newsgroups&apos; offline feature lets you
+  download your mail and read it offline (while disconnected from the
+  Internet). If you use a dial-up (modem) connection to access your mail and
+  you want to reduce the time you are connected, or, if you need to temporarily
+  disconnect from your company&apos;s network while traveling or switching
+  locations, you can download your mail so that you can read it offline. The
+  offline feature can automatically download incoming messages and then later
+  send all your outgoing messages when you reconnect.</p>
+
+<p>Note that for POP accounts your mail is already downloaded by default, so
+  most of these offline features aren&apos;t relevant for POP accounts.</p>
+
+<p>If you occasionally want to work offline, &brandShortName; Mail &amp;
+  Newsgroups lets you easily:</p>
+
+<ul>
+  <li>Download your Inbox for offline use.</li>
+  <li>Download an individual folder for offline use.</li>
+  <li>Download only selected or flagged messages for offline use.</li>
+  <li>Download directory entries in your address book for offline use.</li>
+</ul>
+
+<p>If you frequently work offline, &brandShortName; Mail &amp; Newsgroups also
+  lets you:</p>
+
+<ul>
+  <li>Set up one or more of your accounts for offline use.</li>
+  <li>Set offline and disk space preferences for each account.</li>
+  <li>Select the folders and newsgroups that you want to view offline.</li>
+</ul>
+
+<p>[<a href="#working_offline">Return to beginning of section</a>]</p>
+
+<h2 id="downloading_all_messages_for_offline_use">Downloading All Messages for
+  Offline Use</h2>
+
+<p>You can tell &brandShortName; Mail &amp; Newsgroups to automatically
+  download your messages for offline use. Later, when you go back online,
+  &brandShortName; Mail &amp; Newsgroups automatically synchronizes your
+  messages with the server.</p>
+
+<p>Note that the Inbox for POP accounts is downloaded by default, so this
+  section does not apply for POP accounts.</p>
+
+<p>To automatically download your messages for offline use, 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>In the left side of the dialog box, under the name of the account you
+    want to use offline, select Synchronization &amp; Storage. (This category
+    is not available for POP accounts.)</li>
+  <li>Check the box labeled <q>Keep messages for this account on this
+    computer</q>.</li>
+  <li>Click OK.</li>
+  <li>Click the Online/Offline indicator <img src="images/online.png" alt=""/>
+    in the lower right corner of the Mail window (to the left of the Cookie
+    icon) to go offline. You will be asked to download messages for them to be
+    available while offline. Click on <q>Download</q> to proceed.</li>
+</ol>
+
+<p><strong>Note</strong>: This setting also applies to any new folders
+  created. While the per-account setting can be overridden for an
+  <a href="#downloading_an_individual_folder_for_offline_use">individual
+  folder</a>, those per-folder settings are <em>removed</em> when the
+  <q>Keep messages</q> box is toggled.</p>
+
+<p>&brandShortName; Mail &amp; Newsgroups automatically downloads all messages
+  in your Inbox so you can read and respond to them while working offline.
+  After disconnecting, &brandShortName; Mail &amp; Newsgroups remains open so
+  you can continue to work with your messages.</p>
+
+<p>To reconnect to the Internet so you can work online:</p>
+
+<ul>
+  <li>Click the Online/Offline indicator <img src="images/offline.png"
+    alt=""/> in the lower right corner of the Mail window (to the left of the
+    Cookie icon) to go back online.</li>
+</ul>
+
+<p>When you go back online, &brandShortName; Mail &amp; Newsgroups
+  automatically synchronizes your Inbox messages with the server, by
+  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="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>
+
+<p>To download a specific folder for offline use, begin from the Mail
+  window:</p>
+
+<ol>
+  <li>In the left side of the Mail window, select the folder that you want to
+    download for offline use.</li>
+  <li>Open the Edit menu, and choose Folder Properties. You see the Properties
+    dialog box.</li>
+  <li>Click the Synchronization tab.</li>
+  <li>Check <q>Select this folder for offline use</q>.</li>
+  <li>Click Download Now if you want to immediately begin downloading the
+    folder&apos;s messages. Alternatively, you can continue working, and when
+    you are ready to go offline, proceed to the next step.</li>
+  <li>Click the Online/Offline indicator <img src="images/online.png" alt=""/>
+    in the lower right corner of the Mail window to go offline.</li>
+  <li>In the Work Offline dialog box, click Download.</li>
+</ol>
+
+<p>&brandShortName; Mail &amp; Newsgroups automatically downloads all messages
+  in the selected folder so you can read and respond to them while working
+  offline. After disconnecting, &brandShortName; Mail &amp; Newsgroups remains
+  open so you can continue to work with your messages.</p>
+
+<p><strong>Note</strong>: Message headers that have been downloaded for reading
+  offline display a darker gray envelope or newsgroup icon.</p>
+
+<p>To reconnect to the Internet so you can work online:</p>
+
+<ul>
+  <li>Click the Online/Offline indicator <img src="images/offline.png"
+    alt=""/> in the lower right corner of the Mail window (to the left of the
+    Cookie icon) to go back online.</li>
+</ul>
+
+<p>&brandShortName; Mail &amp; Newsgroups automatically synchronizes the
+  offline folders with the server, by replicating any changes you made while
+  working offline.</p>
+
+<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="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
+  you have enabled the <q>Fetch headers only</q> setting in the POP account
+  settings, then only the headers will be downloaded, and you will need to use
+  the commands in this section to download the complete messages.</p>
+
+<p>To download selected messages for offline use, begin from the Mail
+  window:</p>
+
+<ol>
+  <li>Select a Mail or Newsgroup folder to display its messages.</li>
+  <li>Select the messages you want to download, as follows:
+    <ul>
+      <li>To select a group of adjacent messages, click the first message, and
+        then Shift-click to select the last message in the group.</li>
+      <li>To select messages anywhere in the message list, hold down the
+        <kbd class="mac">Cmd</kbd><kbd class="noMac">Ctrl</kbd> key and click
+        each message.</li>
+    </ul>
+  </li>
+  <li>Open the File menu, choose Offline, and then choose Get Selected Messages
+    from the submenu. &brandShortName; Mail &amp; Newsgroups downloads the
+    selected messages.</li>
+</ol>
+
+<p>To download flagged messages for offline use, begin from the Mail
+  window:</p>
+
+<ol>
+  <li>Select a Mail or Newsgroup folder to display its messages.</li>
+  <li>Click in the flag column of each message you want to download. A flag
+    appears where you clicked to indicate that the message has been marked. If
+    the flag column is not visible, click the Show/Hide Columns icon
+    <img src="images/columns.png" alt=""/> and select Flag from the list.</li>
+  <li>Open the File menu, choose Offline, and then choose Get Flagged Messages.
+    &brandShortName; Mail &amp; Newsgroups downloads the flagged messages.</li>
+</ol>
+
+<p>Once downloading is complete, click the Online/Offline indicator in the
+  lower right corner of the Mail window (to the left of the Cookie icon) to go
+  offline. After you disconnect, &brandShortName; Mail &amp; Newsgroups remains
+  open so you can continue to work with your messages.</p>
+
+<p>Note that the <q>Get Selected Messages</q> and <q>Get Flagged Messages</q>
+  menu items are also available in the pop-up thread context menu, for faster
+  access.</p>
+
+<p><strong>Note</strong>: Message headers that have been downloaded for reading
+  offline display a darker gray envelope or newsgroup icon.</p>
+
+<p>To reconnect to the Internet so you can work online:</p>
+
+<ul>
+  <li>Click the Online/Offline indicator <img src="images/offline.png"
+    alt=""/> in the lower right corner of the Mail window to go online.</li>
+</ul>
+
+<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="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
+  computer so that they are available when you work offline. Once you&apos;ve
+  downloaded directory entries, you can use the same procedure to update your
+  local copy of the entries with the latest entries on the directory
+  server.</p>
+
+<p>To download or update an address book LDAP directory for offline use:</p>
+
+<ol>
+  <li>Make sure you&apos;re online.</li>
+  <li>Open the Window menu, and choose Address Book.</li>
+  <li>In the Address Book window, select the directory that you want to
+    download (replicate).</li>
+  <li>Click Properties in the Address Book toolbar. The Directory Server
+    Properties dialog box appears.</li>
+  <li>Click the Offline tab.</li>
+  <li>Click Download Now to start copying the entries to your computer.</li>
+  <li>If prompted, enter your network user name and password, and click OK to
+    start the download.
+
+    <p>Depending on the number of directory entries, the download process may
+      take a while, so please be patient.</p>
+  </li>
+</ol>
+
+<p>After the download finishes, you can work offline and search the directory
+  or use it for address autocompletion when composing messages. After
+  you&apos;ve been using your local copy of the directory for a while, you may
+  wish to update it to get the latest entries from the directory server. To
+  update your local copy, use the procedure described above.</p>
+
+<p>[<a href="#working_offline">Return to beginning of section</a>]</p>
+
+<h2 id="setting_up_your_accounts_for_working_offline">Setting Up Your Accounts
+  for Working Offline</h2>
+
+<p>To set up one or more accounts for working offline, you use the Offline and
+  Disk Space preferences in the Mail &amp; Newsgroups Account Settings dialog
+  box. Once set, you don&apos;t need to change these preferences each time you
+  want to work offline. The offline and disk space preferences you can set for
+  an account depend on the type of account (IMAP, POP, or Newsgroup).</p>
+
+<p>Here&apos;s a summary of the steps you will follow to set up your accounts
+  for offline use:</p>
+
+<ol>
+  <li>For each account that you want to work with while offline, use the Mail
+    &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="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>
+  <li>Select the type of messages (mail or newsgroup or both) that you want to
+    download.
+
+    <p><strong>Important</strong>: You must select at least one category (mail
+      messages or newsgroup messages) in order for the download to work.</p>
+  </li>
+  <li>Select <q>Work offline once download and/or sync is complete</q>.</li>
+  <li>Click OK to download the selected items and then go offline. See
+    <a href="#downloading_and_synchronizing_your_messages">Downloading and
+    Synchronizing Your Messages</a> for more information.</li>
+</ol>
+
+<p>For subsequent offline sessions, you can skip step 1.</p>
+
+<p>[<a href="#working_offline">Return to beginning of section</a>]</p>
+
+<h2 id="selecting_items_for_offline_viewing">Selecting Items for Offline
+  Viewing</h2>
+
+<p>Before you can read mail and newsgroup messages while offline, you must
+  first select them for downloading. You can set up an entire account for
+  offline use. You can also choose which folders and newsgroups that you
+  want to use offline.</p>
+
+<p><strong>Note</strong>: Keep in mind that selecting more items may increase
+  download time and disk space used.</p>
+
+<p>To select accounts, folders, and newsgroups for offline viewing, 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>Choose the Synchronization &amp; Storage category for the account you
+    want to change.</li>
+  <li>Click <q>Advanced</q> to see your IMAP folders, or <q>Select newsgroups
+    for offline use</q> for your subscribed newsgroups.
+
+    <p><strong>Note</strong>: You see only the newsgroups and folders that
+      you&apos;ve already
+      <a href="mail_help.xhtml#subscribing_to_newsgroups">subscribed</a>
+      to. POP accounts and local mail folders don&apos;t appear in the
+      list.</p>
+  </li>
+  <li>Select the items (folders, newsgroups) that you want to make available
+    for offline use.</li>
+  <li>Click OK.</li>
+</ol>
+
+<p>Once set, you don&apos;t need to change these settings each time you want to
+  go offline. However, if you do want to change them, you can easily do so
+  before going offline, since the same Select button is available when using
+  the <a href="#downloading_and_synchronizing_your_messages">Download and
+  Sync</a> command.</p>
+
+<p>[<a href="#working_offline">Return to beginning of section</a>]</p>
+
+<h2 id="downloading_and_synchronizing_your_messages">Downloading and
+  Synchronizing Your Messages</h2>
+
+<p>If you have already selected mail folders and newsgroups for offline use,
+  you are now ready to download and synchronize them. If you haven&apos;t yet
+  selected items to download, you can choose them before you go offline.</p>
+
+<p>If you are not already viewing the Download/Sync Now dialog box, follow
+  these steps:</p>
+
+<p>To download and synchronize your messages, begin from the Mail
+ window:</p>
+
+<ol>
+  <li>Open the File menu, choose Offline, and then choose Download/Sync
+    Now.</li>
+  <li>Select the categories (mail messages or newsgroup messages) that you want
+    to download.
+
+    <p><strong>Important</strong>: You must select at least one category (Mail
+      messages, Newsgroup messages) in order for the download to work. If the
+      checkboxes are disabled, it means that you haven&apos;t yet selected
+      items to download. Use the Select button to select items to download.</p>
+  </li>
+  <li>To send messages in your Unsent Messages folder before going offline,
+    check <q>Send Unsent Messages</q>.</li>
+  <li>To go offline immediately after &brandShortName; Mail &amp; Newsgroups
+    finishes downloading, select <q>Work offline once download and/or sync is
+    complete</q>.</li>
+  <li>To set or change the items to download, click Select. See
+    <a href="#selecting_items_for_offline_viewing">Selecting Items for Offline
+    Viewing</a> for more information. You can skip this step if you&apos;ve
+    already selected items for download.</li>
+  <li>Click OK. &brandShortName; Mail &amp; Newsgroups begins downloading the
+    selected items.</li>
+</ol>
+
+<p>If you chose to work offline once the download completes, then
+  &brandShortName; Mail &amp; Newsgroups immediately switches to offline mode.
+  Otherwise, when you are ready to go offline, click the Online/Offline
+  indicator <img src="images/online.png" alt=""/> in the lower right corner of
+  the Mail window to go offline.</p>
+
+<p>[<a href="#working_offline">Return to beginning of section</a>]</p>
+
+<h2 id="working_offline_and_reconnecting_later">Working Offline and
+  Reconnecting Later</h2>
+
+<p>To work offline and reconnect later, begin from the Mail window.</p>
+
+<p>When you are ready to work offline:</p>
+
+<ol>
+  <li>Click the online/offline indicator <img src="images/online.png" alt=""/>
+    in the lower-right corner of the Mail window. Mail &amp; Newsgroups prompts
+    you to download messages, if you want, before going offline.</li>
+  <li>Click Download to download messages before going offline. If you want to
+    work offline without downloading messages, click Don&apos;t Download.</li>
+</ol>
+
+<p><strong>Note</strong>: Message headers that have been downloaded for reading
+  offline display a darker gray envelope or newsgroup icon.</p>
+
+<p><strong>Tip</strong>: To set &brandShortName; Mail &amp; Newsgroups&apos;
+  download behavior when going offline, open the
+  <span class="mac">&brandShortName;</span> <span class="noMac">Edit</span>
+  menu, choose Preferences, and then under the Mail &amp; Newsgroups category,
+  select Network &amp; Storage (if no subcategories are visible, double-click
+  Mail &amp; Newsgroups to expand the list). You can choose to have
+  &brandShortName; Mail &amp; Newsgroups prompt you to download messages when
+  going offline, to automatically download messages, or to not download any
+  messages.</p>
+
+<p>To reconnect and synchronize your messages:</p>
+
+<ol>
+  <li>Click the online/offline indicator <img src="images/offline.png"
+    alt=""/> in the lower-right corner of any &brandShortName; window.</li>
+  <li>Open the File menu, choose Offline, and then choose Download/Sync
+    Now.</li>
+</ol>
+
+<p>&brandShortName; Mail &amp; Newsgroups synchronizes your messages with the
+  server by replicating any changes you made while working offline.</p>
+
+<p><strong>Tip</strong>: To set &brandShortName; Mail &amp; Newsgroups&apos;
+  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>
+</body>
+</html>
new file mode 100644
--- /dev/null
+++ b/suite/chrome/common/help/mailnews_preferences.xhtml
@@ -0,0 +1,642 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
+  "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"[
+  <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" >
+  %brandDTD;
+]>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Mail &amp; Newsgroups Preferences</title>
+<link rel="stylesheet" href="helpFileLayout.css" type="text/css"/>
+<link rel="stylesheet" href="chrome://communicator/skin/smileys.css"
+      type="text/css"/>
+</head>
+<body>
+
+<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="mail_help.xhtml#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="mail_help.xhtml#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="mail_help.xhtml#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="mailnews_account_settings.xhtml#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="mailnews_offline.xhtml#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/nav_help.xhtml
+++ b/suite/chrome/common/help/nav_help.xhtml
@@ -1196,21 +1196,16 @@ Súbor a kliknúť na položku Nastavenie tlače.</p>
       sa zobrazí pri každom spustení aplikácie &brandShortName;. V prípade, že zrušíte označenie voľby <q>Kontrolovať pri
       každom spustení</q>, otázka sa prestane objavovať.</p>
 
     <p>Aj keď zrušíte označenie voľby <q>Kontrolovať pri
       každom spustení</q>, môžete nastaviť aplikáciu &brandShortName; ako svoj predvolený prehliadač zmenou nastavení v
       Možnostiach. Ďalšie informácie nájdete v kapitole <a href="cs_nav_prefs_navigator.xhtml#navigator">Nastavenia
       prehliadača - Prehliadač</a>.</p>
 
-    <h3 id="customizing_default_browser_settings">Prispôsobenie si predvolených nastavení prehliadača</h3>
-
-    <p>Spôsob, akým má &brandShortName; spravovať rôzne typy súborov a protokolov si môžete nastaviť manuálne. Ďalšie informácie
-      nájdete v kapitole <a href="cs_nav_prefs_advanced.xhtml#system">Pokročilé nastavenie - Systém</a>.</p>
-
     <p>[<a href="#improving_speed_and_efficiency">Návrat na začiatok kapitoly</a>]</p>
 
 </div>
 
 <h1 id="proxies">Servery Proxy</h1>
 
 <p>Mnoho organizácií blokuje prístup z Internetu do svojej siete. Tým zabraňujú tomu, aby ktokoľvek z Internetu mal prístup k
   citlivým firemným dátam. Táto ochrana sa nazýva firewall.</p>
--- a/suite/chrome/common/help/suite-toc.rdf
+++ b/suite/chrome/common/help/suite-toc.rdf
@@ -146,17 +146,17 @@
         <rdf:li> <rdf:Description ID="mail-doc-attach"  nc:name="Using Attachments" nc:link="mail_help.xhtml#using_attachments" /> </rdf:li>
         <rdf:li> <rdf:Description ID="mail-doc-delete" nc:name="Deleting Messages" nc:link="mail_help.xhtml#deleting_messages" /> </rdf:li>
         <rdf:li> <rdf:Description ID="mail-doc-address" nc:name="Using Address Books" nc:link="mail_help.xhtml#using_address_books" /> </rdf:li>
         <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="mail-doc-offline" nc:name="Working Offline" nc:link="mailnews_offline.xhtml#working_offline" /> </rdf:li>
         <rdf:li> <rdf:Description ID="sign-encrypt" nc:name="Signing &amp; Encrypting Messages" nc:link="mail_sec_help.xhtml#signing_and_encrypting_messages" /> </rdf:li>
         <rdf:li> <rdf:Description ID="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="mailnews_preferences.xhtml#mail_and_newsgroup_preferences" /> </rdf:li>
       </rdf:Seq>
     </nc:subheadings>
   </rdf:Description>
 
 
@@ -399,25 +399,25 @@
         <rdf:li> <rdf:Description ID="mail-blogs-moving-feeds" nc:name="Moving a feed to another folder" nc:link="mail_help.xhtml#moving_a_feed_to_another_folder"/> </rdf:li>
       </rdf:Seq>
     </nc:subheadings>
   </rdf:Description>
 
 <rdf:Description about="#mail-doc-offline">
     <nc:subheadings>
       <rdf:Seq>
-        <rdf:li> <rdf:Description ID="mail-offline-setup" nc:name="Setting Up Mail to Work Offline" nc:link="mail_help.xhtml#setting_up_mozilla_mail_and_newsgroups_to_work_offline"/> </rdf:li>
-        <rdf:li> <rdf:Description ID="mail-offline-inbox" nc:name="Downloading All Messages for Offline Use" nc:link="mail_help.xhtml#downloading_all_messages_for_offline_use"/> </rdf:li>
-        <rdf:li> <rdf:Description ID="mail-offline-folder" nc:name="Downloading an Individual Folder" nc:link="mail_help.xhtml#downloading_an_individual_folder_for_offline_use"/> </rdf:li>
-        <rdf:li> <rdf:Description ID="mail-offline-flagged" nc:name="Downloading Selected or Flagged Messages" nc:link="mail_help.xhtml#downloading_selected_or_flagged_messages_for_offline_use"/> </rdf:li>
-        <rdf:li> <rdf:Description ID="mail-offline-directory" nc:name="Downloading Directory Entries" nc:link="mail_help.xhtml#downloading_directory_entries_for_offline_use"/> </rdf:li>
-        <rdf:li> <rdf:Description ID="mail-offline-accounts" nc:name="Setting Up Your Accounts for Working Offline" nc:link="mail_help.xhtml#setting_up_your_accounts_for_working_offline"/> </rdf:li>
-        <rdf:li> <rdf:Description ID="mail-offline-items" nc:name="Selecting Items for Offline Viewing" nc:link="mail_help.xhtml#selecting_items_for_offline_viewing"/> </rdf:li>
-        <rdf:li> <rdf:Description ID="mail-offline-sync" nc:name="Downloading and Synchronizing Your Messages" nc:link="mail_help.xhtml#downloading_and_synchronizing_your_messages"/> </rdf:li>
-        <rdf:li> <rdf:Description ID="mail-offline-go" nc:name="Working Offline and Reconnecting Later" nc:link="mail_help.xhtml#working_offline_and_reconnecting_later"/> </rdf:li>
+        <rdf:li> <rdf:Description ID="mail-offline-setup" nc:name="Setting Up Mail to Work Offline" nc:link="mailnews_offline.xhtml#setting_up_mozilla_mail_and_newsgroups_to_work_offline"/> </rdf:li>
+        <rdf:li> <rdf:Description ID="mail-offline-inbox" nc:name="Downloading All Messages for Offline Use" nc:link="mailnews_offline.xhtml#downloading_all_messages_for_offline_use"/> </rdf:li>
+        <rdf:li> <rdf:Description ID="mail-offline-folder" nc:name="Downloading an Individual Folder" nc:link="mailnews_offline.xhtml#downloading_an_individual_folder_for_offline_use"/> </rdf:li>
+        <rdf:li> <rdf:Description ID="mail-offline-flagged" nc:name="Downloading Selected or Flagged Messages" nc:link="mailnews_offline.xhtml#downloading_selected_or_flagged_messages_for_offline_use"/> </rdf:li>
+        <rdf:li> <rdf:Description ID="mail-offline-directory" nc:name="Downloading Directory Entries" nc:link="mailnews_offline.xhtml#downloading_directory_entries_for_offline_use"/> </rdf:li>
+        <rdf:li> <rdf:Description ID="mail-offline-accounts" nc:name="Setting Up Your Accounts for Working Offline" nc:link="mailnews_offline.xhtml#setting_up_your_accounts_for_working_offline"/> </rdf:li>
+        <rdf:li> <rdf:Description ID="mail-offline-items" nc:name="Selecting Items for Offline Viewing" nc:link="mailnews_offline.xhtml#selecting_items_for_offline_viewing"/> </rdf:li>
+        <rdf:li> <rdf:Description ID="mail-offline-sync" nc:name="Downloading and Synchronizing Your Messages" nc:link="mailnews_offline.xhtml#downloading_and_synchronizing_your_messages"/> </rdf:li>
+        <rdf:li> <rdf:Description ID="mail-offline-go" nc:name="Working Offline and Reconnecting Later" nc:link="mailnews_offline.xhtml#working_offline_and_reconnecting_later"/> </rdf:li>
       </rdf:Seq>
     </nc:subheadings>
   </rdf:Description>
 
 <rdf:Description about="#sign-encrypt">
     <nc:subheadings>
       <rdf:Seq>
         <rdf:li> <rdf:Description ID="sign-encrypt-about" nc:name="Digital Signatures &amp; Encryption" nc:link="mail_sec_help.xhtml#about_digital_signatures_and_encryption" /> </rdf:li>
@@ -787,16 +787,17 @@
     <nc:subheadings>
       <rdf:Seq>
         <rdf:li><rdf:Description ID="navigator_pref_history" nc:name="History" nc:link="cs_nav_prefs_navigator.xhtml#history"/> </rdf:li>
         <rdf:li><rdf:Description ID="navigator_pref_languages" nc:name="Languages" nc:link="cs_nav_prefs_navigator.xhtml#languages"/> </rdf:li>
         <rdf:li><rdf:Description ID="navigator_pref_helper_applications" nc:name="Helper Applications" nc:link="cs_nav_prefs_navigator.xhtml#helper_applications"/> </rdf:li>
         <rdf:li><rdf:Description ID="navigator_pref_location_bar" nc:name="Location Bar" nc:link="cs_nav_prefs_navigator.xhtml#location_bar"/> </rdf:li>
         <rdf:li><rdf:Description ID="navigator_pref_internet_searching" nc:name="Internet Search" nc:link="cs_nav_prefs_navigator.xhtml#internet_search"/> </rdf:li>
         <rdf:li><rdf:Description ID="navigator_pref_tabbed_browsing" nc:name="Tabbed Browsing" nc:link="cs_nav_prefs_navigator.xhtml#tabbed_browsing"/> </rdf:li>
+        <rdf:li><rdf:Description ID="navigator_pref_link_behavior" nc:name="Link Behavior" nc:link="cs_nav_prefs_navigator.xhtml#link_behavior"/> </rdf:li>
         <rdf:li><rdf:Description ID="navigator_pref_downloads" nc:name="Downloads" nc:link="cs_nav_prefs_navigator.xhtml#downloads"/> </rdf:li>
       </rdf:Seq>
     </nc:subheadings>
   </rdf:Description>
 
 <rdf:Description about="#advanced_pref_advanced">
     <nc:subheadings>
       <rdf:Seq>
@@ -860,25 +861,16 @@
         <rdf:li><rdf:Description ID="cookies_stored" nc:name="Stored Cookies" nc:link="using_priv_help.xhtml#stored_cookies"/> </rdf:li>
         <rdf:li><rdf:Description ID="cookie_sites" nc:name="Cookie Sites" nc:link="using_priv_help.xhtml#cookie_sites"/> </rdf:li>
         <rdf:li><rdf:Description ID="cookie_notify" nc:name="Cookie Notification" nc:link="using_priv_help.xhtml#cookie_notification"/> </rdf:li>
 
       </rdf:Seq>
     </nc:subheadings>
   </rdf:Description>
 
-<rdf:Description about="#privacy_levels">
-    <nc:subheadings>
-      <rdf:Seq>
-        <rdf:li><rdf:Description ID="privacy_levels-level" nc:name="Level of Privacy" nc:link="using_priv_help.xhtml#level_of_privacy"/> </rdf:li>
-        <rdf:li><rdf:Description ID="privacy_levels-accept" nc:name="Cookie Acceptance Policy" nc:link="using_priv_help.xhtml#cookie_acceptance_policy"/> </rdf:li>
-      </rdf:Seq>
-    </nc:subheadings>
-  </rdf:Description>
-
 <rdf:Description about="#using-priv-help-password">
     <nc:subheadings>
       <rdf:Seq>
         <rdf:li><rdf:Description ID="using-priv-help-password-manage" nc:name="Remembering User Names and Passwords" nc:link="using_priv_help.xhtml#using_password_manager_to_remember_user_names_and_passwords"/> </rdf:li>
         <rdf:li><rdf:Description ID="using-priv-help-password-auto" nc:name="Entering Names and Passwords Automatically" nc:link="using_priv_help.xhtml#entering_user_names_and_passwords_automatically"/> </rdf:li>
         <rdf:li><rdf:Description ID="using-priv-help-password-onoff" nc:name="Turning Password Manager On and Off" nc:link="using_priv_help.xhtml#turning_password_manager_on_and_off"/> </rdf:li>
         <rdf:li><rdf:Description ID="using-priv-help-password-view" nc:name="Managing Stored Passwords" nc:link="using_priv_help.xhtml#viewing_and_managing_stored_passwords"/> </rdf:li>
         <rdf:li><rdf:Description ID="using-priv-help-password-settings" nc:name="Nastavenie hesla" nc:link="passwords_help.xhtml#password_settings"/> </rdf:li>
new file mode 100644
--- /dev/null
+++ b/suite/chrome/common/places/places.properties
@@ -0,0 +1,75 @@
+load-js-data-url-error=Z bezpečnostných dôvodov nemôžu byť adresy obsahujúce údaje alebo JavaScript načítané z okna histórie alebo bočného panela.
+noTitle=(bez názvu)
+
+bookmarksMenuEmptyFolder=(prázdne)
+
+bookmarksBackupTitle=Názov súboru so zálohou záložiek
+
+bookmarksRestoreAlertTitle=Obnoviť záložky
+bookmarksRestoreAlert=Týmto nahradíte všetky svoje aktuálne záložky zálohou. Naozaj to chcete urobiť?
+bookmarksRestoreTitle=Vybrať zálohu záložiek
+bookmarksRestoreFilterName=JSON
+bookmarksRestoreFilterExtension=*.json
+
+bookmarksRestoreFormatError=Nepodporovaný typ súboru.
+bookmarksRestoreParseError=Nie je možné spracovať súbor zálohy.
+
+bookmarksLivemarkLoading=Načíta sa aktívna záložka…
+bookmarksLivemarkFailed=Načítanie kanála aktívnej záložky zlyhalo.
+
+menuOpenLivemarkOrigin.label=Otvoriť "%S"
+
+view.sortBy.name.label=Usporiadať podľa názvu
+view.sortBy.name.accesskey=n
+view.sortBy.url.label=Usporiadať podľa servera
+view.sortBy.url.accesskey=s
+view.sortBy.date.label=Usporiadať podľa času poslednej návštevy
+view.sortBy.date.accesskey=d
+view.sortBy.visitCount.label=Usporiadať podľa počtu návštev
+view.sortBy.visitCount.accesskey=t
+view.sortBy.keyword.label=Usporiadať podľa kľúčového slova
+view.sortBy.keyword.accesskey=k
+view.sortBy.description.label=Usporiadať podľa popisu
+view.sortBy.description.accesskey=o
+view.sortBy.dateAdded.label=Usporiadať podľa času pridania
+view.sortBy.dateAdded.accesskey=r
+view.sortBy.lastModified.label=Usporiadať podľa času poslednej úpravy
+view.sortBy.lastModified.accesskey=v
+view.sortBy.tags.label=Usporiadať podľa značiek
+view.sortBy.tags.accesskey=U
+
+searchBookmarks=Hľadať v záložkách
+searchCurrentDefault=Hľadať v priečinku '%S'
+findInPrefix=Hľadať v priečinku '%S'…
+
+tabs.openWarningTitle=Potvrdenie otvorenia
+tabs.openWarningMultipleBranded=Chystáte sa otvoriť niekoľko kariet naraz (celkom %S). Toto môže spomaliť %S počas ich načítavania. Naozaj chcete pokračovať?
+tabs.openButtonMultiple=Otvoriť karty
+tabs.openWarningPromptMeBranded=Upozorniť ma v prípade, že otvorenie viacerých kariet môže spomaliť %S
+
+SelectImport=Import súboru záložiek
+EnterExport=Export súboru záložiek
+
+saveSearch.title=Uložiť vyhľadávanie
+saveSearch.inputLabel=Názov:
+saveSearch.inputDefaultText=Nové hľadanie
+
+detailsPane.noItems=Žiadne položky
+detailsPane.oneItem=Počet položiek: 1
+detailsPane.multipleItems=Počet položiek: %S
+
+# SK_NOTE mostVisitedTitle: Toolbar button with Najnavštevovanejšie doesn't fit in Linux/Mac
+mostVisitedTitle=Najobľúbenejšie
+recentlyBookmarkedTitle=Naposledy pridané
+recentTagsTitle=Naposledy použité značky
+
+OrganizerQueryHistory=História
+OrganizerQueryAllBookmarks=Všetky záložky
+OrganizerQueryTags=Značky
+
+# LOCALIZATION NOTE (lockPrompt.text)
+# %S will be replaced with the application name.
+lockPrompt.title=Chyba pri spustení prehliadača
+lockPrompt.text=Systém záložiek a histórie nebude funkčný, pretože jeden zo súborov prehliadača %S je používaný inou aplikáciou. Tento problém môžu spôsobovať niektoré bezpečnostné aplikácie.
+lockPromptInfoButton.label=Ďalšie informácie
+lockPromptInfoButton.accessKey=a
--- a/suite/chrome/common/pref/pref-content.dtd
+++ b/suite/chrome/common/pref/pref-content.dtd
@@ -2,21 +2,14 @@
 
 <!ENTITY pref.content.title                     "Obsah">
 <!ENTITY pref.content.description               "Tieto nastavenia ovplyvňujú zobrazenie webových stránok a obsahu správ v programe &brandShortName;.">
 <!ENTITY siteIcons.label                        "Ikony webových stránok">
 <!ENTITY useSiteIcons.label                     "Zobrazovať ikony webových stránok">
 <!ENTITY useSiteIcons.accesskey                 "Z">
 <!ENTITY useFavIcons.label                      "Agresívne hľadať ikony webových stránok, ak nie sú definované">
 <!ENTITY useFavIcons.accesskey                  "A">
-<!ENTITY tbIconsDescription.label               "Zobrazovanie ikon webových stránok v ponuke záložiek a v paneli nástrojov:">
-<!ENTITY tbIconsNever.label                     "Nikdy nezobrazovať ikony v záložkách">
-<!ENTITY tbIconsNever.accesskey                 "N">
-<!ENTITY tbIconsCache.label                     "Len ak bola stránka nedávno načítaná">
-<!ENTITY tbIconsCache.accesskey                 "L">
-<!ENTITY tbIconsAlways.label                    "Vždy načítať ikony webových stránok v záložkách">
-<!ENTITY tbIconsAlways.accesskey                "V">
 <!ENTITY enableAutomaticImageResizing.label     "Meniť veľkosť veľkých obrázkov na veľkosť okna">
 <!ENTITY enableAutomaticImageResizing.accesskey "M">
 <!ENTITY useSmoothScroll.label                  "Použiť plynulé posúvanie">
 <!ENTITY useSmoothScroll.accesskey              "o">
 <!ENTITY textZoomOnly.label                     "Meniť veľkosť textu namiesto celého obsahu stránok">
 <!ENTITY textZoomOnly.accesskey                 "e">
--- a/suite/chrome/common/pref/pref-links.dtd
+++ b/suite/chrome/common/pref/pref-links.dtd
@@ -1,14 +1,14 @@
 <!ENTITY linksHeader.label "Správanie sa odkazov">
 <!ENTITY newWindow.label "Správanie pri otváraní odkazov">
 <!ENTITY newWindowDescription.label "Otvárať odkazy, ktoré sa majú otvoriť v okne">
 <!ENTITY external.label "Odkazy z iných aplikácií">
 <!ENTITY externalDescription.label "Odkazy z iných aplikácií otvárať">
 <!ENTITY openCurrent.label "V aktuálnej karte/okne">
 <!ENTITY newWindowGroupCurrent.accesskey "V">
-<!ENTITY externalGroupCurrent.accesskey "k">
+<!ENTITY externalGroupCurrent.accesskey "a">
 <!ENTITY openTab.label "Na novej karte v aktuálnom okne">
-<!ENTITY newWindowGroupTab.accesskey "a">
+<!ENTITY newWindowGroupTab.accesskey "k">
 <!ENTITY externalGroupTab.accesskey "r">
 <!ENTITY openWindow.label "V novom okne">
 <!ENTITY newWindowGroupWindow.accesskey "o">
 <!ENTITY externalGroupWindow.accesskey "n">
--- a/suite/chrome/common/quitDialog.properties
+++ b/suite/chrome/common/quitDialog.properties
@@ -1,11 +1,12 @@
-quitDialogTitle=Ukončiť %S
-restartDialogTitle=Reštartovať %S
+quitDialogTitle=Ukončenie programu %S
+restartDialogTitle=Reštartovanie programu %S
 
+restartNowTitle=&Reštartovať teraz
+restartLaterTitle=Reštartovať &neskôr
 quitTitle=U&končiť
-restartTitle=&Reštartovať
 cancelTitle=&Zrušiť
 saveTitle=&Uložiť a ukončiť
-neverAsk=Toto okno už viac nezobrazovať
+neverAsk=&Toto okno už viac nezobrazovať
 message=Chcete, aby %S uložil otvorené karty a okná a použil ich pri nasledujúcom spustení?
 messageNoWindows=Chcete, aby %S uložil otvorené karty a použil ich pri nasledujúcom spustení?
 messageRestart=%S sa po reštartovaní pokúsi obnoviť otvorené karty a okná.
--- a/suite/chrome/common/utilityOverlay.properties
+++ b/suite/chrome/common/utilityOverlay.properties
@@ -1,15 +1,15 @@
 # Online/offline tooltips
-onlineTooltip0=Režim online (server proxy: žiadny). Kliknutím na ikonu prejdete do režimu offline.
-onlineTooltip1=Režim online (server proxy: manuálne nastavený). Kliknutím na ikonu prejdete do režimu offline.
-onlineTooltip2=Režim online (server proxy: automatický pomocou adresy URL). Kliknutím na ikonu prejdete do režimu offline.
-onlineTooltip4=Režim online (server proxy: automatický). Kliknutím na ikonu prejdete do režimu offline.
-onlineTooltip5=Režim online (server proxy: nastavený v systéme). Kliknutím na ikonu prejdete do režimu offline.
-offlineTooltip=Režim offline. Kliknutím na ikonu prejdete do režimu online.
+onlineTooltip0=Režim online (server proxy: žiadny). Kliknutím na ikonu prejdete do režimu offline
+onlineTooltip1=Režim online (server proxy: manuálne nastavený). Kliknutím na ikonu prejdete do režimu offline
+onlineTooltip2=Režim online (server proxy: automatický pomocou adresy URL). Kliknutím na ikonu prejdete do režimu offline
+onlineTooltip4=Režim online (server proxy: automatický). Kliknutím na ikonu prejdete do režimu offline
+onlineTooltip5=Režim online (server proxy: nastavený v systéme). Kliknutím na ikonu prejdete do režimu offline
+offlineTooltip=Režim offline. Kliknutím na ikonu prejdete do režimu online
 
 # Popup menus
 popupMenuShow=Zobraziť %S
 popupAllow=Povoliť vyskakovacie okná z %S
 
 # Check for Updates
 updatesItem_default=Kontrola aktualizácií…
 updatesItem_defaultFallback=Kontrola aktualizácií…
--- a/suite/chrome/mailnews/appleMailImportMsgs.properties
+++ b/suite/chrome/mailnews/appleMailImportMsgs.properties
@@ -8,17 +8,17 @@
 #
 # 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 Apple Mail importer code.
 #
-# The Initial Developer of the Original Code is 
+# The Initial Developer of the Original Code is
 # Håkan Waara <hwaara@gmail.com>.
 # Portions created by the Initial Developer are Copyright (C) 2008
 # the Initial Developer. All Rights Reserved.
 #
 # Contributor(s):
 #
 # Alternatively, the contents of this file may be used under the terms of
 # either the GNU General Public License Version 2 or later (the "GPL"), or
--- a/suite/chrome/mailnews/imapMsgs.properties
+++ b/suite/chrome/mailnews/imapMsgs.properties
@@ -427,20 +427,20 @@ 5115=Tiket Kerberos/GSSAPI nebol serverom IMAP %S akceptovaný. Skontrolujte, či ste prihlásený k doméne Kerberos/GSSAPI realm.
 
 ## @name IMAP_LOGIN_DISABLED
 ## @loc None
 # LOCALIZATION NOTE (5116): %S is the account name
 5116=Nie je možné prihlásiť sa k účtu %S, pretože server neumožňuje overenie bez použitia STARTTLS alebo SSL/TLS. Skúste v nastaveniach účtu povoliť zabezpečené sieťové pripojenie alebo bezpečné overenie.
 
 ## @name IMAP_SERVER_COMMAND_FAILED
 ## @loc None
-# LOCALIZATION NOTE (5117): 
+# LOCALIZATION NOTE (5117):
 # Place the word %1$S in your translation where the name of the account name should appear.
 # Place the word %2$S in your translation where the server response should appear.
-5117=Aktuálne vykonávaný príkaz zlyhal. Poštový server pre účet %1$S odpovedal: %2$S 
+5117=Aktuálne vykonávaný príkaz zlyhal. Poštový server pre účet %1$S odpovedal: %2$S
 
 ## @name IMAP_FOLDER_COMMAND_FAILED
 ## @loc None
 # LOCALIZATION NOTE (5118): Do not translate the word %S below.
 # Place the word %1$S in your translation where the name of the account should appear.
 # Place the word %2$S in your translation where the name of the folder should appear.
 # Place the word %3$S in your translation where the server response should appear.
 5118=Práve vykonávaná operácia na priečinku '%2$S' zlyhala. Poštový server pre účet %1$S odpovedal: %3$S
--- a/suite/chrome/mailnews/mime.properties
+++ b/suite/chrome/mailnews/mime.properties
@@ -40,119 +40,119 @@
 
 # Mail subject
 ## @name MIME_MHTML_SUBJECT
 ## @loc None
 1000=Predmet
 
 # Resent-Comments
 ## @name MIME_MHTML_RESENT_COMMENTS
-## @loc 
+## @loc
 1001=Znovu odoslané - komentáre
 
 # Resent-Date
 ## @name MIME_MHTML_RESENT_DATE
-## @loc 
+## @loc
 1002=Znovu odoslané - dátum
 
 # Resent-Sender
 ## @name MIME_MHTML_RESENT_SENDER
-## @loc 
+## @loc
 1003=Znovu odoslané - odosielateľ
 
 # Resent-From
 ## @name MIME_MHTML_RESENT_FROM
-## @loc 
+## @loc
 1004=Znovu odoslané - od
 
 # Resent-To
 ## @name MIME_MHTML_RESENT_TO
-## @loc 
+## @loc
 1005=Znovu odoslané - komu
 
 # Resent-CC
 ## @name MIME_MHTML_RESENT_CC
-## @loc 
+## @loc
 # LOCALIZATION NOTE (1006): Do not translate "CC" below.
 1006=Znovu odoslané - kópia
 
 # Date
 ## @name MIME_MHTML_DATE
-## @loc 
+## @loc
 1007=Dátum
 
 # Sender
 ## @name MIME_MHTML_SENDER
-## @loc 
+## @loc
 1008=Odosielateľ
 
 # From
 ## @name MIME_MHTML_FROM
-## @loc 
+## @loc
 1009=Od
 
 # Reply-To
 ## @name MIME_MHTML_REPLY_TO
-## @loc 
+## @loc
 1010=Odpoveď komu
 
 # Organization
 ## @name MIME_MHTML_ORGANIZATION
-## @loc 
+## @loc
 1011=Organizácia
 
 # To
 ## @name MIME_MHTML_TO
-## @loc 
+## @loc
 1012=Pre
 
 # CC
 ## @name MIME_MHTML_CC
-## @loc 
+## @loc
 # LOCALIZATION NOTE (1013): Do not translate "CC" below.
 1013=Kópia
 
 # Newsgroups
 ## @name MIME_MHTML_NEWSGROUPS
-## @loc 
+## @loc
 1014=Diskusné skupiny
 
 # Followup-To
 ## @name MIME_MHTML_FOLLOWUP_TO
-## @loc 
+## @loc
 1015=Pokračovať na
 
 # References
 ## @name MIME_MHTML_REFERENCES
-## @loc 
+## @loc
 1016=Referencie
 
 # Message ID
 ## @name MIME_MHTML_MESSAGE_ID
-## @loc 
+## @loc
 1021=ID správy
 
 # BCC
 ## @name MIME_MHTML_BCC
-## @loc 
+## @loc
 1023=Skrytá kópia
 
 # Link to doc
 ## @name MIME_MSG_LINK_TO_DOCUMENT
-## @loc 
+## @loc
 1026=Odkaz na dokument
 
 # Get Doc info
 ## @name MIME_MSG_DOCUMENT_INFO
-## @loc 
+## @loc
 1027=<B>Informácie o dokumente:</B>
 
 # Msg Attachment
 ## @name MIME_MSG_ATTACHMENT
-## @loc 
+## @loc
 1028=Príloha
 
 # Partial Message Format 1
 ## @name MIME_MSG_PARTIAL_FMT_1
 ## @loc
 # LOCALIZATION NOTE (1037): In the following line, translate only the word, "Truncated!".
 1037=<P><CENTER><TABLE BORDER CELLSPACING=5 CELLPADDING=10 WIDTH="80%%"><TR><TD ALIGN=CENTER><FONT SIZE="+1"><B>Skrátené!</B></FONT><HR>
 
@@ -168,24 +168,24 @@ 1038=<B>Táto správa presahuje nastavenú maximálnu veľkosť, preto bolo prevzatých len pár prvých riadkov.<P>Kliknutím <A HREF="
 ## @name MIME_MSG_PARTIAL_FMT_3
 ## @loc
 # LOCALIZATION NOTE (1039): This section must begin with the ">" sign and end with the tags,"</B></TD></TR></TABLE></CENTER>"
 # Do not translate "</A>" tag.
 1039=">sem</A> prevezmete zvyšnú časť správy.</B></TD></TR></TABLE></CENTER>
 
 # default attachment name
 ## @name MIME_MSG_DEFAULT_ATTACHMENT_NAME
-## @loc 
+## @loc
 # LOCALIZATION NOTE (1040): Do not translate "%s" below.
 # Place the %s where you wish the part number of the attachment to appear
 1040=Časť %s
 
 # default forwarded message prefix
 ## @name MIME_FORWARDED_MESSAGE_HTML_USER_WROTE
-## @loc 
+## @loc
 1041=----- Pôvodná správa -----
 
 # Partial Message Format2 1
 ## @name MIME_MSG_PARTIAL_FMT2_1
 ## @loc
 # LOCALIZATION NOTE (1037): In the following line, translate only the words, "Not Downloaded".
 1042=<P><CENTER><TABLE BORDER CELLSPACING=5 CELLPADDING=10 WIDTH="80%%"><TR><TD ALIGN=CENTER><FONT SIZE="+1"><B>Neprevzaté</B></FONT><HR>
 
--- a/suite/chrome/mailnews/msgmdn.properties
+++ b/suite/chrome/mailnews/msgmdn.properties
@@ -1,44 +1,45 @@
-#***** BEGIN LICENSE BLOCK *****
-#Version: MPL 1.1/GPL 2.0/LGPL 2.1
+# ***** 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/
+# 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.
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
 #
-#The Original Code is mozilla.
+# The Original Code is mozilla.
 #
-#The Initial Developer of the Original Code is
+# The Initial Developer of the Original Code is
 #  Jeff Tsai <jt95070@netscape.net>.
-#Portions created by the Initial Developer are Copyright (C) 2002
-#the Initial Developer. All Rights Reserved.
+# Portions created by the Initial Developer are Copyright (C) 2002
+# the Initial Developer. All Rights Reserved.
 #
-#Contributor(s):
+# Contributor(s):
 #  Seth Spitzer <sspitzer@netscape.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 GPL or the LGPL. If you do not delete
-#the provisions above, a recipient may use your version of this file under
-#the terms of any one of the MPL, the GPL or the LGPL.
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
 #
 #***** END LICENSE BLOCK *****
+
 ## Msg Mdn Report strings
 MsgMdnDisplayed=Poznamka: Vasa sprava bola zobrazena na pocitaci adresata. Nie je vsak zarucene, ze sprava bola precitana cela a ze adresat porozumel jej obsahu.
 MsgMdnDispatched=Sprava bola bud vytlacena, odfaxovana alebo odoslana dalej bez citania. Nie je iste, ci si adresat spravu precita neskor.
 MsgMdnProcessed=Sprava bola automaticky spracovana postovym klientom adresata bez citania. Nie je iste, ci si adresat spravu precita neskor.
 MsgMdnDeleted=Sprava bola odstranena. Nie je iste, ci vobec bola citana. Je vsak mozne, ze adresat ju neskor obnovi a precita.
 MsgMdnDenied=Adresat tejto spravy si nezelal odoslat vam potvrdenie o precitani.
 MsgMdnFailed=Nastala chyba! Nepodarilo sa vytvorit alebo odoslat vam platne potvrdenie o precitani.
 # LOCALIZATION NOTE : Do not translate the word "%S" below.
--- a/suite/chrome/mailnews/pref/replicationProgress.properties
+++ b/suite/chrome/mailnews/pref/replicationProgress.properties
@@ -1,14 +1,14 @@
 #***** 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 
+#The contents of this file are subject to the Mozilla Public License Version
+#1.1 (the "License"); you may not use this file except in compliance with
+#the License. You may obtain a copy of the License at
 #http://www.mozilla.org/MPL/
 #
 #Software distributed under the License is distributed on an "AS IS" basis,
 #WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
 #for the specific language governing rights and limitations under the
 #License.
 #
 #The Original Code is mozilla.
--- a/suite/chrome/mailnews/shutdownWindow.properties
+++ b/suite/chrome/mailnews/shutdownWindow.properties
@@ -9,17 +9,17 @@
 # Software distributed under the License is distributed on an "AS IS" basis,
 # WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
 # for the specific language governing rights and limitations under the
 # License.
 #
 # The Original Code is mozilla.org code.
 #
 # The Initial Developer of the Original Code is
-# 
+#
 # Portions created by the Initial Developer are Copyright (C) 2007
 # the Initial Developer. All Rights Reserved.
 #
 # Contributor(s):
 #   Nick Kreeger <nick.kreeger@park.edu>
 #
 # Alternatively, the contents of this file may be used under the terms of
 # either of the GNU General Public License Version 2 or later (the "GPL"),
--- a/suite/chrome/mozldap/ldap.properties
+++ b/suite/chrome/mozldap/ldap.properties
@@ -1,9 +1,9 @@
-# 
+#
 # ***** 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/
 #
--- a/toolkit/chrome/global/aboutSupport.dtd
+++ b/toolkit/chrome/global/aboutSupport.dtd
@@ -26,12 +26,16 @@
 variant of aboutSupport.show.label.  This allows us to use the preferred
 "Finder" terminology on Mac. -->
 <!ENTITY aboutSupport.showMac.label "Zobraziť vo Finderi">
 
 <!ENTITY aboutSupport.modifiedPrefsTitle "Upravené nastavenia">
 <!ENTITY aboutSupport.modifiedPrefsName "Názov">
 <!ENTITY aboutSupport.modifiedPrefsValue "Hodnota">
 
+<!ENTITY aboutSupport.graphicsTitle "Grafika">
+<!-- LOCALIZATION NOTE In the following string, "Direct2D" is a proper noun and should not be translated -->
+<!ENTITY aboutSupport.graphicsDirect2DEnabled "Direct2D povolené">
+
 <!ENTITY aboutSupport.installationHistoryTitle "História inštalácií">
 <!ENTITY aboutSupport.updateHistoryTitle "História aktualizácií">
 
 <!ENTITY aboutSupport.copyToClipboard.label "Kopírovať všetko do schránky">
--- a/toolkit/chrome/global/config.dtd
+++ b/toolkit/chrome/global/config.dtd
@@ -16,17 +16,17 @@
    - The Initial Developer of the Original Code is
    - Netscape Communications Corporation.
    - Portions created by the Initial Developer are Copyright (C) 2002
    - the Initial Developer. All Rights Reserved.
    -
    - Contributor(s):
    -
    - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or 
+   - either the GNU General Public License Version 2 or later (the "GPL"), or
    - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
    - in which case the provisions of the GPL or the LGPL are applicable instead
    - of those above. If you wish to allow use of your version of this file only
    - under the terms of either the GPL or the LGPL, and not to allow others to
    - use your version of this file under the terms of the MPL, indicate your
    - decision by deleting the provisions above and replace them with the notice
    - and other provisions required by the GPL or the LGPL. If you do not delete
    - the provisions above, a recipient may use your version of this file under
--- a/toolkit/chrome/global/headsUpDisplay.properties
+++ b/toolkit/chrome/global/headsUpDisplay.properties
@@ -1,36 +1,40 @@
-typeError=Chyba: 
-typeWarning=Upozornenie: 
-typeNetwork=Sieť: 
-typeException=Výnimka:  
-typeCssParser=Parser CSS: 
-typeStrict=Striktné upozornenie: 
-msgCategory=Kategória: 
+typeError=Chyba:
+typeWarning=Upozornenie:
+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:
 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
-tipCSSParser=Prepnúť zaznamenávanie upozornení CSS
-btnException=Výnimky
-tipException=Prepnúť zaznamenávanie výnimiek
-btnError=Chyba
-tipError=Prepnúť zaznamenávanie chýb
-btnInfo=Informácie
-tipInfo=Prepnúť zaznamenávanie informácií
-btnWarn=Upozornenia
-tipWarn=Prepnúť zaznamenávanie upozornení
-btnLog=Záznam
-tipLog=Prepnúť vytváranie záznamu
+categoryPage=Stránka:
+categoryConsole=Konzola:
+btnMutation=Mutácie DOM
+tipMutation=Zaznamenávať udalosti mutácií DOM
+btnPageNet=Sieť
+tipPageNet=Zaznamenávať prístup k sieti
+btnPageCSS=CSS
+tipPageCSS=Zaznamenávať chyby spracovania CSS
+btnPageJS=JS
+tipPageJS=Zaznamenávať výnimky JavaScriptu
+btnConsoleErrors=Chyby
+tipConsoleErrors=Zaznamenávať volania console.error()
+btnConsoleInfo=Info
+tipConsoleInfo=Zaznamenávať volania console.info()
+btnConsoleWarnings=Upozornenia
+tipConsoleWarnings=Zaznamenávať volania console.warn()
+btnConsoleLog=Záznam
+tipConsoleLog=Zaznamenávať volania console.log()
 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
+copyCmd.label=Kopírovať
+copyCmd.accesskey=K
--- a/toolkit/chrome/mozapps/extensions/extensions.dtd
+++ b/toolkit/chrome/mozapps/extensions/extensions.dtd
@@ -18,18 +18,18 @@
 <!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.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.viewUpdates.label            "Zobraziť nedávno aktualizované">
+<!ENTITY updates.viewUpdates.accesskey        "Z">
 <!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">
@@ -106,17 +106,17 @@
 <!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é)">
 <!-- LOCALIZATION NOTE (addon.update.postfix): This is used to signify that an item is an update, in the form "Addon v1.0 Update" -->
-<!ENTITY addon.update.postfix                 "Aktualizácia">
+<!ENTITY addon.update.postfix                 "(aktualizácia)">
 <!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">
--- a/toolkit/chrome/mozapps/plugins/plugins.properties
+++ b/toolkit/chrome/mozapps/plugins/plugins.properties
@@ -9,17 +9,17 @@ pluginInstallation.install.error=Nepodarilo sa nainštalovať %S (%S).
 
 pluginInstallation.complete=Inštalácia zásuvných modulov dokončená.
 
 pluginInstallationSummary.success=Nainštalované
 pluginInstallationSummary.failed=Zlyhalo
 pluginInstallationSummary.licenseNotAccepted=Licencia nebola akceptovaná.
 pluginInstallationSummary.notAvailable=Nie je dostupné
 pluginInstallationSummary.manualInstall.label=Ručná inštalácia
-pluginInstallationSummary.manualInstall.tooltip=Inštalovať zásuvný modul ručne.
+pluginInstallationSummary.manualInstall.tooltip=Inštalovať zásuvný modul ručne
 
 pluginInstallation.noPluginsFound=Žiadny vyhovujúci zásuvný modul nebol nájdený.
 pluginInstallation.noPluginsInstalled=Nebol nainštalovaný žiadny zásuvný modul.
 pluginInstallation.unknownPlugin=Neznámy zásuvný modul (%S)
 
 pluginInstallation.restart.label=Reštartovať %S
 pluginInstallation.restart.accesskey=R
 pluginInstallation.close.label=Zavrieť