update
authorsektormaster@atlas.sk
Sat, 28 May 2011 15:09:39 +0200
changeset 203 a104c9ec6e596801f43aabe4764ebb06ac38f59f
parent 198 ea415e3cb6d5150b7744017ddadcbbdcfac75bb6
child 204 a384d667354d8cef711d2f735fe9a76851fd9d78
push id1
push usersledru@mozilla.com
push dateFri, 05 Dec 2014 02:19:11 +0000
update
browser/chrome/browser/preferences/privacy.dtd
editor/ui/chrome/composer/editorOverlay.dtd
extensions/irc/chrome/chatzilla.properties
mail/chrome/messenger/aboutDialog.dtd
mail/chrome/messenger/aboutSupportMail.dtd
mail/chrome/messenger/accountCreation.properties
mail/chrome/messenger/baseMenuOverlay.dtd
mail/chrome/messenger/credits.dtd
mail/chrome/messenger/editContactOverlay.dtd
mail/chrome/messenger/messenger.dtd
mail/chrome/messenger/messenger.properties
mail/chrome/messenger/msgHdrViewOverlay.dtd
other-licenses/branding/thunderbird/brand.dtd
suite/chrome/browser/mac/navigator.properties
suite/chrome/browser/navigator.dtd
suite/chrome/browser/navigator.properties
suite/chrome/browser/unix/navigator.properties
suite/chrome/browser/win/navigator.properties
suite/chrome/common/bookmarks/places.dtd
suite/chrome/common/contentAreaCommands.dtd
suite/chrome/common/help/cs_nav_prefs_advanced.xhtml
suite/chrome/common/mac/platformCommunicatorOverlay.dtd
suite/chrome/common/notification.properties
suite/chrome/common/pref/pref-search.dtd
suite/chrome/common/search/search-panel.dtd
suite/chrome/common/tasksOverlay.dtd
suite/chrome/common/unix/platformCommunicatorOverlay.dtd
suite/chrome/common/utilityOverlay.dtd
suite/chrome/common/utilityOverlay.properties
suite/chrome/common/win/platformCommunicatorOverlay.dtd
suite/chrome/mailnews/FilterEditor.dtd
suite/chrome/mailnews/compose/messengercompose.dtd
suite/chrome/mailnews/messenger.properties
suite/chrome/mailnews/pref/am-copies.dtd
suite/chrome/mailnews/vcard.properties
suite/installer/unix/README
suite/installer/windows/README.txt
--- a/browser/chrome/browser/preferences/privacy.dtd
+++ b/browser/chrome/browser/preferences/privacy.dtd
@@ -1,12 +1,12 @@
 <!ENTITY tracking.label                 "Sledovanie">
 
 <!ENTITY doNotTrack.label                "Požiadať webové stránky, aby nesledovali moju aktivitu">
-<!ENTITY doNotTrack.accesskey            "p">
+<!ENTITY doNotTrack.accesskey            "w">
 
 <!ENTITY  history.label                 "História">
 
 <!ENTITY  locationBar.label             "Panel s adresou">
 
 <!ENTITY  locbar.pre.label              "Pri používaní panela s adresou ponúkať záznamy:">
 <!ENTITY  locbar.pre.accessKey          "v">
 <!ENTITY  locbar.post.label             "">
--- a/editor/ui/chrome/composer/editorOverlay.dtd
+++ b/editor/ui/chrome/composer/editorOverlay.dtd
@@ -40,19 +40,16 @@
    -
    - ***** END LICENSE BLOCK ***** -->
 
 <!-- Attn: Localization - some of the menus in this dialog directly affect mail also. -->
 
 <!-- File menu items -->
 <!ENTITY fileMenu.label "Súbor">
 <!ENTITY fileMenu.accesskey "S">
-<!ENTITY newBlankPageCmd.label "Prázdna stránka">
-<!ENTITY newBlankPageCmd.accesskey "P">
-<!ENTITY newMenu.label "Nový">
 <!ENTITY openFileCmd.label "Otvoriť súbor…">
 <!ENTITY openFileCmd.accesskey "O">
 <!ENTITY openFileCmd.key "O">
 <!ENTITY openRemoteCmd.label "Otvoriť miesto na webe…">
 <!ENTITY openRemoteCmd.accesskey "m">
 <!ENTITY openRemoteCmd.key "L">
 <!ENTITY fileRecentMenu.label "Naposledy použité stránky">
 <!ENTITY fileRecentMenu.accesskey "r">
@@ -388,16 +385,17 @@
 <!ENTITY convertToTable.label "Vytvoriť tabuľku z výberu">
 <!ENTITY convertToTable.accesskey "a">
 <!ENTITY tableProperties.label "Vlastnosti tabuľky…">
 <!ENTITY tableProperties.accesskey "o">
 
 <!-- Toolbar-only items -->
 <!ENTITY menuBar.tooltip "Panel Ponuka">
 <!ENTITY formatToolbar.tooltip "Panel Formátovanie">
+<!ENTITY newToolbarCmd.label "Nový">
 <!ENTITY newToolbarCmd.tooltip "Nová prázdna stránka">
 <!ENTITY openToolbarCmd.label "Otvoriť">
 <!ENTITY openToolbarCmd.tooltip "Otvoriť lokálnu stránku">
 <!ENTITY saveToolbarCmd.tooltip "Uložiť stránku lokálne">
 <!ENTITY publishToolbarCmd.tooltip "Odoslať súbor na vzdialený server">
 <!ENTITY printToolbarCmd.label "Tlačiť">
 <!ENTITY printToolbarCmd.tooltip "Tlačiť stránku">
 <!ENTITY findToolbarCmd.label "Hľadať">
--- a/extensions/irc/chrome/chatzilla.properties
+++ b/extensions/irc/chrome/chatzilla.properties
@@ -64,17 +64,17 @@
 #
 # Note: the ChatZilla version and expected locale versions may not always be
 #       the same. For example, if only non-locale changes have been made, the
 #       expected locale version will stay the same. This is to make using
 #       localisations between versions easier.
 #
 ### End of notes ###
 
-locale.version = 0.9.86.1
+locale.version = 0.9.87
 locale.error = Používate ChatZillu %1$S, ktorá vyžaduje verziu prekladu %2$S. Verzia aktuálne vybraného prekladu (%3$S) je %4$S, preto sa môžu vyskytnúť problémy s činnosťou ChatZilly.\n\nOdporúča sa, aby ste aktualizovali alebo odstránili uvedený preklad.
 locale.authors = Vlado Valaštiak (wladow);Ján Kendi (Jacen)
 
 # Misc
 
 unknown=<neznámy>
 none=<žiadny>
 na=<nedostupný>
@@ -359,16 +359,19 @@ cmd.font-size-default.label = Predvolená &veľkosť
 cmd.font-size-small.label   = &Malá
 cmd.font-size-medium.label  = &Stredná
 cmd.font-size-large.label   = &Veľká
 
 cmd.font-size-other.format  = Iná ($fontSize pt)…
 cmd.font-size-other.label   = &Iná…
 cmd.font-size-other.help    = Vyžiada zadanie veľkosti písma.
 
+cmd.goto-startup.label  = Otvoriť automatické pripojenia
+cmd.goto-startup.help   = Otvorí všetky adresy URL pre vaše automatické pripojenia.
+
 cmd.goto-url.label  = Otvoriť odkaz
 cmd.goto-url.format = $label
 cmd.goto-url.params = <url> [<anchor>]
 cmd.goto-url.help   = Otvorí adresu URL určenú v <url>. Ak <url> nie je irc:, bude otvorená v aktuálnom okne prehliadača. Ak <url> je alias pre adresu url, voliteľným parametrom <anchor> môžete určiť kotvu adresy.
 
 cmd.goto-url-newwin.label  = Otvoriť v novom okne
 cmd.goto-url-newwin.params = <url> [<anchor>]
 cmd.goto-url-newwin.help   = Otvorí URL adresu určenú v <url>. Ak <url> nie je irc:, bude otvorená v novom okne prehliadača. Ak <url> je alias pre adresu url, voliteľným parametrom <anchor> môžete určiť kotvu adresy.
--- a/mail/chrome/messenger/aboutDialog.dtd
+++ b/mail/chrome/messenger/aboutDialog.dtd
@@ -1,16 +1,83 @@
-<!ENTITY aboutDialog.title      "O programe &brandFullName;">
-<!ENTITY aboutButton.label      "&lt; Naspäť">
-<!ENTITY aboutButton.accesskey  "N">
-<!ENTITY aboutVersion           "verzia">
-<!ENTITY aboutMenu.label        "O programe">
-<!ENTITY aboutMenu.accesskey    "O">
-<!ENTITY aboutCredits.label     "Tvorcovia">
-<!ENTITY aboutCredits.accesskey "T">
-<!ENTITY aboutRights.label      "Spoznajte vaše práva">
-<!ENTITY aboutRights.accesskey  "S">
-<!ENTITY aboutContributors.label "Prispievatelia">
-<!ENTITY aboutContributors.accesskey "P">
-<!ENTITY aboutLicense.label      "Licencia">
-<!ENTITY aboutLicense.accesskey  "L">
+<!ENTITY aboutDialog.title          "O programe &brandFullName;">
+
+<!ENTITY community.start2           "&brandShortName; vytvára ">
+<!-- LOCALIZATION NOTE (community.mozillaLink): This is a link title that links to http://www.mozilla.org/. -->
+<!ENTITY community.mozillaLink      "&vendorShortName;">
+<!ENTITY community.middle2          ", ">
+<!-- LOCALIZATION NOTE (community.creditsLink): This is a link title that links to about:credits. -->
+<!ENTITY community.creditsLink      "globálna komunita">
+<!ENTITY community.end2             " pracujúca s cieľom urobiť internet lepším. Veríme, že internet by mal byť otvorený, verejný a dostupný každému bez akýchkoľvek obmedzení.">
+
+<!ENTITY contribute.start           "Znie to zaujímavo? ">
+<!-- LOCALIZATION NOTE (contribute.getInvolvedLink): This is a link title that links to http://www.mozilla.org/contribute/. -->
+<!ENTITY contribute.getInvolvedLink "Zapojte sa!">
+<!ENTITY contribute.end             "">
+
+<!-- LOCALIZATION NOTE (bottomLinks.license): This is a link title that links to about:license. -->
+<!ENTITY bottomLinks.license        "Informácie o licenciách">
+
+<!-- LOCALIZATION NOTE (bottomLinks.rights): This is a link title that links to about:rights. -->
+<!ENTITY bottomLinks.rights         "Práva koncového používateľa">
+
+<!-- LOCALIZATION NOTE (bottomLinks.privacy): This is a link title that links to http://www.mozilla.com/legal/privacy/. -->
+<!ENTITY bottomLinks.privacy        "Zásady ochrany súkromia">
+
+<!-- LOCALIZATION NOTE (update.checkingForUpdates): try to make the localized text short (see bug 596813 for screenshots). -->
+<!ENTITY update.checkingForUpdates  "Vyhľadávajú sa aktualizácie…">
+<!-- LOCALIZATION NOTE (update.checkingAddonCompat): try to make the localized text short (see bug 596813 for screenshots). -->
+<!ENTITY update.checkingAddonCompat "Kontroluje sa kompatibilita doplnkov…">
+<!-- LOCALIZATION NOTE (update.noUpdatesFound): try to make the localized text short (see bug 596813 for screenshots). -->
+<!ENTITY update.noUpdatesFound      "Používate najnovšiu verziu programu &brandShortName;">
+<!-- LOCALIZATION NOTE (update.adminDisabled): try to make the localized text short (see bug 596813 for screenshots). -->
+<!ENTITY update.adminDisabled       "Aktualizácie boli vypnuté správcom systému">
+
+<!-- LOCALIZATION NOTE (update.failed.start,update.failed.linkText,update.failed.end):
+     update.failed.start, update.failed.linkText, and update.failed.end all go into
+     one line with linkText being wrapped in an anchor that links to a site to download
+     the latest version of Firefox (e.g. http://www.firefox.com). As this is all in
+     one line, try to make the localized text short (see bug 596813 for screenshots). -->
+<!ENTITY update.failed.start        "Aktualizácia zlyhala. ">
+<!ENTITY update.failed.linkText     "Prevziať najnovšiu verziu">
+<!ENTITY update.failed.end          "">
+
+<!-- LOCALIZATION NOTE (update.manual.start,update.manual.end): update.manual.start and update.manual.end
+     all go into one line and have an anchor in between with text that is the same as the link to a site
+     to download the latest version of Firefox (e.g. http://www.firefox.com). As this is all in one line,
+     try to make the localized text short (see bug 596813 for screenshots). -->
+<!ENTITY update.manual.start        "Prevziať ">
+<!ENTITY update.manual.linkText     "najnovšiu verziu">
+<!ENTITY update.manual.end          "">
+
+<!-- LOCALIZATION NOTE (update.downloading.start,update.downloading.end): update.downloading.start and 
+     update.downloading.end all go into one line, with the amount downloaded inserted in between. As this
+     is all in one line, try to make the localized text short (see bug 596813 for screenshots). The — is
+     the "em dash" (long dash).
+     example: Downloading update — 111 KB of 13 MB -->
+<!ENTITY update.downloading.start   "Preberá sa aktualizácia — ">
+<!ENTITY update.downloading.end     "">
+
+<!-- LOCALIZATION NOTE (channel.description.start,channel.description.end): channel.description.start and
+     channel.description.end create one sentence, with the current channel label inserted in between.
+     example: You are currently on the _Stable_ update channel. -->
+<!ENTITY channel.description.start  "Práve používate aktualizačný kanál ">
+<!ENTITY channel.description.end    ". ">
+
+<!ENTITY channel.change             "Zmeniť">
+
+<!ENTITY channel.release.description       "Vyskúšajte overené a otestované finálne vydania používané stovkami miliónov používateľov po celom svete. Majte kontrolu nad svojimi zážitkami zo sveta online vďaka super rýchlosti, veľkej prispôsobiteľnosti a najnovším technológiám.">
+<!ENTITY channel.beta.description          "Užite si najnovšie funkcie v stabilnom prostredí. Poskytnite nám spätnú väzbu a pomôžte nám doladiť finálnu verziu programu.">
+<!ENTITY channel.aurora.description        "Užite si najnovšie inovácie v nestabilnom prostredí, ktoré nie je pre slabé povahy. Odošlite nám spätnú väzbu na funkcie a výkon aplikácie, aby sme vedeli, čo máme do sprístupnenia finálnej verzie zlepšiť.">
+
+<!-- LOCALIZATION NOTE (channel.selector.start,channel.selector.end): channel.selector.start and
+     channel.selector.end create one sentence, with a channel selection menulist instered in between.
+     This is all in one line, so try to make the localized text short.
+     example: Switch to the [Stable] update channel. -->
+<!ENTITY channel.selector.start          "Prepnúť na aktualizačný kanál">
+<!ENTITY channel.selector.end            ".">
+
+<!-- LOCALIZATION NOTE (channel.selector.applyButton): This button applies the user's choice to switch
+     to a new update channel and starts the application update process. -->
+<!ENTITY channel.selector.applyButton    "Použiť a aktualizovať">
+<!ENTITY channel.selector.cancelButton   "Zrušiť">
 
 <!ENTITY cmdCloseMac.commandKey "w">
--- a/mail/chrome/messenger/aboutSupportMail.dtd
+++ b/mail/chrome/messenger/aboutSupportMail.dtd
@@ -2,13 +2,14 @@
 
 <!ENTITY aboutSupport.accountsTitle "Poštové a diskusné účty">
 <!ENTITY aboutSupport.showPrivateData.mainText "Zahrnúť názvy účtov">
 <!ENTITY aboutSupport.showPrivateData.explanationText "(môže obsahovať údaje o identite)">
 <!ENTITY aboutSupport.accountsID "ID">
 <!ENTITY aboutSupport.accountsName "Názov">
 <!ENTITY aboutSupport.accountsIncomingServer "Server pre prijímanie pošty">
 <!ENTITY aboutSupport.accountsOutgoingServers "Server pre odosielanie pošty">
+<!ENTITY aboutSupport.accountsServerName "Názov">
 <!ENTITY aboutSupport.accountsConnSecurity "Zabezpečenie spojenia">
 <!ENTITY aboutSupport.accountsAuthMethod "Metóda overenia">
 <!ENTITY aboutSupport.accountsDefault "Predvolený?">
 
 <!ENTITY aboutSupport.sendViaEmail.label "Odoslať ako e-mailovú správu">
--- a/mail/chrome/messenger/accountCreation.properties
+++ b/mail/chrome/messenger/accountCreation.properties
@@ -29,16 +29,18 @@ found_settings_isp=Nastavenia boli nájdené na serveri poskytovateľa e-mailovej služby
 # LOCALIZATION NOTE(found_settings_db): Do not translate or replace Mozilla. It stands for the public project mozilla.org, not Mozilla Messaging. The database is a generic, public domain facility usable by any client.
 found_settings_db=Nastavenia boli nájdené v databáze poskytovateľov Mozilla ISP
 # LOCALIZATION NOTE(found_settings_guess): We tried common mail server names and we found a mail server and talked to it and it responded properly, so we think we found a suitable configuration, but we are only about 80% certain that it is the correct setting for this email address. There's a chance that email address may not actually be served by this server and it won't work, or that there is a better server.
 found_settings_guess=Nastavenia boli zistené skúšaním bežných názvov serverov
 found_settings_halfmanual=Nasledujúce nastavenia boli zistené skúšaním zadaného názvu servera
 # LOCALIZATION NOTE(failed_to_find_settings): %1$S will be the brandShortName.
 failed_to_find_settings=%1$Su sa nepodarilo nájsť nastavenia pre váš poštový účet.
 manually_edit_config=Úprava konfigurácie
+# LOCALIZATION NOTE(guessed_settings_offline) User is offline, so we just took a wild guess and the user will have to enter the right settings.
+guessed_settings_offline=Práve ste v režime offline. Niektoré nastavenia sme sa pokúsili odhadnúť, ale korektné hodnoty budete musieť vložiť sami.
 
 # config subtitles
 check_preconfig=kontrola predkonfigurácie…
 found_preconfig=nájdená predkonfigurácia
 checking_config=kontroluje sa konfigurácia…
 found_config=Nájdená konfigurácia pre váš účet
 checking_mozilla_config=kontrola konfigurácií Mozilla Community…
 found_isp_config=nájdená konfigurácia
--- a/mail/chrome/messenger/baseMenuOverlay.dtd
+++ b/mail/chrome/messenger/baseMenuOverlay.dtd
@@ -17,11 +17,10 @@
 <!ENTITY featureConfiguratorCmd.accesskey "s">
 <!ENTITY openHelp.label "Obsah pomocníka">
 <!ENTITY openHelp.accesskey "O">
 <!ENTITY openHelp.commandkey "VK_F1">
 <!ENTITY openHelpMac.label "Pomocník programu &brandShortName;">
 <!ENTITY openHelpMac2.commandkey   "?">
 <!ENTITY openHelpMac2.modifiers    "accel">
 
-<!ENTITY updateCmd.label "Kontrola aktualizácií…">
 <!ENTITY aboutMenuCmd.label "O programe &brandShortName;">
 <!ENTITY aboutMenuCmd.accesskey "m">
deleted file mode 100644
--- a/mail/chrome/messenger/credits.dtd
+++ /dev/null
@@ -1,13 +0,0 @@
-<!ENTITY credit.title     "O programe &brandFullName;">
-<!ENTITY brandMotto       "Thunderbirds Are Go!">
-<!ENTITY credit.thanks    "Špeciálne poďakovanie">
-
-<!-- localization credits look like this: -->
-<!--
-<!ENTITY credit.translation
-  "<h3>Translators</h3><ul><li>Name Here</li></ul>">
--->
-<!ENTITY credit.translation "<h3>Vedúci prekladu do slovenčiny</h3><ul><li>Branislav Rozbora</li></ul><h3>Preklady</h3><ul><li>Vlado Valaštiak (wladow)</li></ul><h3>Korektúry</h3><ul><li>Peter Mikšík (SlovakSoft)</li></ul><h3>Slovník pre kontrolu pravopisu</h3><ul><li>Zdenko Podobný</li></ul>">
-
-<!ENTITY credit.memory      "V spomienke na">
-<!ENTITY credit.poweredByGecko "Poháňané jadrom Gecko&trade;">
--- a/mail/chrome/messenger/editContactOverlay.dtd
+++ b/mail/chrome/messenger/editContactOverlay.dtd
@@ -10,8 +10,10 @@
 <!ENTITY editContactAddressBook.label "Adresár:">
 <!ENTITY editContactAddressBook.accesskey "A">
 
 <!ENTITY editContactPanelCancel.label "Zrušiť">
 <!ENTITY editContactPanelCancel.accesskey "Z">
 
 <!ENTITY editContactPanelDone.label "Hotovo">
 <!ENTITY editContactPanelDone.accesskey "H">
+
+<!ENTITY contactMoveDisabledWarning.description "Adresár nie je možné zmeniť, pretože kontakt sa nachádza v rozosielacom zozname.">
--- a/mail/chrome/messenger/messenger.dtd
+++ b/mail/chrome/messenger/messenger.dtd
@@ -4,19 +4,16 @@
 
 <!-- File Menu -->
 <!ENTITY newFolderCmd.label "Priečinok…">
 <!ENTITY newFolderCmd.accesskey "P">
 <!ENTITY closeTabCmd2.label "Zavrieť kartu">
 <!ENTITY closeTabCmd2.accesskey "Z">
 <!ENTITY closeOtherTabsCmd2.label "Zavrieť ostatné karty">
 <!ENTITY closeOtherTabsCmd2.accesskey "a">
-<!-- LOCALIZATION NOTE (undoCloseTabCmd.label):
-     Menu option to attempt to re-open a recently closed tab.
-     -->
 <!ENTITY recentlyClosedTabsCmd.label "Naposledy zatvorené karty">
 <!ENTITY recentlyClosedTabsCmd.accesskey "N">
 
 <!ENTITY undoCloseTabCmd.commandkey "T">
 <!-- LOCALIZATION NOTE (moveToNewWindow.label):
      Menu option to cause the current tab to be migrated to a new Thunderbird
      window.
      -->
@@ -34,17 +31,16 @@
 <!ENTITY openAttachmentCmd.accesskey "P">
 <!ENTITY saveAsMenu.label "Uložiť ako">
 <!ENTITY saveAsMenu.accesskey "U">
 <!ENTITY saveAsFileCmd.label "Súbor">
 <!ENTITY saveAsFileCmd.accesskey "S">
 <!ENTITY saveAsFileCmd.key "s">
 <!ENTITY saveAsTemplateCmd.label "Šablóna">
 <!ENTITY saveAsTemplateCmd.accesskey "b">
-<!ENTITY getNewMsgCmd.key "d">
 <!ENTITY getNewMsgForCmd.label "Prijať nové správy pre">
 <!ENTITY getNewMsgForCmd.accesskey "s">
 <!ENTITY getAllNewMsgCmdPopupMenu.label "Všetky účty">
 <!ENTITY getAllNewMsgCmdPopupMenu.accesskey "V">
 <!ENTITY getNewMsgCurrentAccountCmdPopupMenu.label "Aktuálny účet">
 <!ENTITY getNewMsgCurrentAccountCmdPopupMenu.accesskey "A">
 <!ENTITY getNextNMsgCmd.label "Prijať ďalších 500 správ">
 <!ENTITY getNextNMsgCmd.accesskey "i">
@@ -516,17 +512,16 @@ you can use these alternative items. Oth
 <!ENTITY tagButton.label "Popis">
 <!ENTITY compactButton.label "Vykonať údržbu">
 
 <!-- Mail Toolbar Tooltips-->
 <!ENTITY advancedButton.tooltip "Pokročilé hľadanie v správach">
 <!ENTITY getMsgButton.tooltip "Prijať nové správy">
 <!ENTITY getAllNewMsgCmd.label "Prijať všetky nové správy">
 <!ENTITY getAllNewMsgCmd.accesskey "P">
-<!ENTITY getAllNewMsgCmd.key "d">
 <!ENTITY newMsgButton.tooltip "Napísať novú správu">
 <!ENTITY replyButton.tooltip "Odpovedať na správu">
 <!ENTITY replyAllButton.tooltip "Odpovedať odosielateľovi a všetkým adresátom">
 <!ENTITY replyListButton.tooltip "Odpovedať členom rozosielacieho zoznamu">
 <!ENTITY forwardButton.tooltip "Odoslať označenú správu ďalej">
 <!ENTITY fileButton.tooltip "Uložiť označenú správu do súboru">
 <!ENTITY archiveButton.tooltip "Presunúť označené správy do archívu">
 <!ENTITY nextButton.tooltip "Presunúť sa na nasledujúcu neprečítanú správu">
@@ -753,22 +748,24 @@ you can use these alternative items. Oth
 
 <!-- Remote Content Bar -->
 <!ENTITY remoteContentMessage2.label "Na ochranu vášho súkromia &brandShortName; v tejto správe zablokoval vzdialený obsah.">
 <!ENTITY loadRemoteContentButton3.label "Zobraziť vzdialený obsah">
 
 <!-- Phishing Bar -->
 <!ENTITY phishingBarMessage2.label "Toto môže byť podvodná správa.">
 <!ENTITY removePhishingBarButton1.label "Ignorovať upozornenie">
+<!ENTITY disablePhishingWarning1.label "Vypnúť detekciu podvodných správ pre všetky správy">
 <!ENTITY reportPhishingError1.label "Zdá sa, že toto nie je podvodná správa.">
 
 <!-- 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">
+<!ENTITY mdnBarIgnoreButton2.label "Ignorovať">
+<!ENTITY mdnBarIgnoreButton2.accesskey "I">
+<!ENTITY mdnBarSendButton2.label "Odoslať potvrdenie">
+<!ENTITY mdnBarSendButton2.accesskey "d">
 
 <!-- Quick Search Bar -->
 <!-- LOCALIZATION NOTE (quickSearchCmd.key):
      This is actually the key used for the global message search box; we have
      not changed
      -->
 <!ENTITY quickSearchCmd.key "k">
 <!-- LOCALIZATION NOTE (searchAllMessages.label.base):
--- a/mail/chrome/messenger/messenger.properties
+++ b/mail/chrome/messenger/messenger.properties
@@ -351,20 +351,30 @@ emptyAttachment=Táto príloha sa javí ako prázdna.\nProsím, overte túto skutočnosť s osobou, ktoré odoslala túto správu.\nNiektoré firemné brány firewall alebo antivírusové programy znehodnocujú e-mailové prílohy.
 # #1 number of attachments
 attachmentCount=#1 príloha;#1 prílohy;#1 príloh
 
 # LOCALIZATION NOTE (attachmentNameAndSize): This is the format for a single
 # item in the attachment list. %1$S is the attachment's filename, and %2$S is
 # the attachment's size
 attachmentNameAndSize=%1$S (%2$S)
 
-# LOCALIZATION NOTE (attachmentCountAndName): This is the format for the
-# attachment header when a message has only one attachment. %1$S is the
-# attachment count, and %2$S is the attachment's filename.
-attachmentCountAndName=%1$S: %2$S
+# LOCALIZATION NOTE (attachmentCountSingle): This is the format for the
+# attachment header when a message has only one attachment. This is separate
+# from attachmentCount above, since attachmentCountSingle typically ends with a
+# colon.
+attachmentCountSingle=1 príloha:
+
+# LOCALIZATION NOTE (attachmentSizeUnknown): The string to show for the total
+# size of all attachments when none of the attachments' sizes can be detected.
+attachmentSizeUnknown=neznáma veľkosť
+
+# LOCALIZATION NOTE (attachmentSizeAtLeast): The string to show for the total
+# size of all attachments when at least one (but not all) of the attachments'
+# sizes can't be detected. %1$S is the formatted size.
+attachmentSizeAtLeast=minimálne %1$S
 
 # This is the format for prepending accesskeys to the
 # each of the attachments in the file|attachments menu:
 #   ie: 1 file.txt
 #       2 another file.txt
 attachmentDisplayNameFormat=%S %S
 
 # This is the heading for the attachment summary when printing an email
@@ -378,19 +388,25 @@ 104=Čas na pripojenie k serveru %S vypršal.
 
 recipientSearchCriteria=Predmet alebo Adresát obsahuje:
 fromSearchCriteria=Predmet alebo Od obsahuje:
 
 # LOCALIZATION NOTES(biffNotification): %1$S is the number of new messages
 biffNotification_message=má %1$S novú správu
 biffNotification_messages=má nové správy (celkom: %1$S)
 
-# LOCALIZATION NOTES(biffNotification): %1$S is the name of the account %2$S is the number of new messages
-newBiffNotification_message=Na účte %1$S je %2$S nová správa
-newBiffNotification_messages=Na účte %1$S sú nové správy (celkom: %2$S)
+# LOCALIZATION NOTE(newMailNotification_message): %1$S is the name of the account %2$S is the number of new messages  
+newMailNotification_message=Na účte %1$S je %2$S nová správa
+
+# LOCALIZATION NOTE(newMailNotification_messages): %1$S is the name of the account %2$S is the number of new messages  
+newMailNotification_messages=Na účte %1$S sú nové správy (celkom: %2$S)
+
+# LOCALIZATION NOTE(newMailNotification_messagetitle): %1$S is subject of new message and %2$S is sender of new message.
+# This is UNIX only
+newMailNotification_messagetitle=%1$S, odosielateľ %2$S
 
 # LOCALIZATION NOTE(macBiffNotification is Mac only):
 #  %1$S is the number of new messages
 #  %2$S is a list of names and/or email addresses separated by biffNotification_separator
 #  %3$S is the number of new messages not displayed in the biff alert
 macBiffNotification_message=%1$S nová správa od %2$S.
 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.
@@ -486,16 +502,21 @@ moveToFolderAgainAccessKey=u
 # copyToFolderAgainAccessKey
 # should have the same value as moveToFolderAgainAccessKey as they are the same menu item in the UI
 copyToFolderAgain=Znova kopírovať do priečinka "%1$S"
 copyToFolderAgainAccessKey=u
 
 #LOCALIZATION NOTE %1$S is the e-mail address of the person we will allow remote content for
 alwaysLoadRemoteContentForSender2=Vždy načítať vzdialený obsah z %1$S
 
+#LOCALIZATION NOTE(mdnBarMessageNormal) %1$S is the name of the sender
+mdnBarMessageNormal=Odosielateľ %1$S žiada potvrdenie o prečítaní tejto správy.
+#LOCALIZATION NOTE(mdnBarMessageAddressDiffers) %1$S is the name of the sender, %2$S is the address(es) to send return receipt to
+mdnBarMessageAddressDiffers=Odosielateľ %1$S žiada potvrdenie o prečítaní tejto správy (na e-mailovú adresu %2$S).
+
 # Strings for growl notifications on Mac OS X
 growlNotification=Nová e-mailová správa
 
 # mailCommands.js
 emptyJunkTitle=Potvrdenie
 emptyJunkMessage=Naozaj chcete natrvalo odstrániť všetky správy a podpriečinky nachádzajúce sa v priečinku Spam?
 emptyJunkDontAsk=Viac sa už nepýtať.
 emptyTrashTitle=Potvrdenie
@@ -655,8 +676,27 @@ lwthemePostInstallNotification.undoButton=Vrátiť späť
 lwthemePostInstallNotification.undoButton.accesskey=V
 lwthemePostInstallNotification.manageButton=Správa tém…
 lwthemePostInstallNotification.manageButton.accesskey=m
 
 # safeModeRestart
 safeModeRestartPromptTitle=Reštart a zakázanie doplnkov
 safeModeRestartPromptMessage=Naozaj chcete zakázať všetky doplnky a reštartovať?
 safeModeRestartButton=Reštartovať
+
+# Check for Updates in the About Dialog - button labels and accesskeys
+# LOCALIZATION NOTE - all of the following update buttons labels will only be
+# displayed one at a time. So, if a button is displayed nothing else will
+# be displayed alongside of the button. The button when displayed is located
+# directly under the Thunderbird version in the about dialog (see bug 596813 for
+# screenshots).
+update.checkInsideButton.label=Vyhľadať aktualizácie
+update.checkInsideButton.accesskey=V
+update.resumeButton.label=Pokračovať v preberaní %S…
+update.resumeButton.accesskey=P
+update.openUpdateUI.applyButton.label=Nainštalovať aktualizáciu…
+update.openUpdateUI.applyButton.accesskey=N
+update.restart.applyButton.label=Nainštalovať aktualizáciu
+update.restart.applyButton.accesskey=N
+update.openUpdateUI.upgradeButton.label=Aktualizovať teraz…
+update.openUpdateUI.upgradeButton.accesskey=A
+update.restart.upgradeButton.label=Aktualizovať teraz
+update.restart.upgradeButton.accesskey=A
--- a/mail/chrome/messenger/msgHdrViewOverlay.dtd
+++ b/mail/chrome/messenger/msgHdrViewOverlay.dtd
@@ -125,21 +125,23 @@
 <!ENTITY openAttachmentMenuItem.label     "otvoriť">
 <!ENTITY openAttachmentMenuItem.accesskey    "o">
 <!ENTITY saveAsAttachmentMenuItem.label    "uložiť ako…">
 <!ENTITY saveAsAttachmentMenuItem.accesskey    "u">
 <!ENTITY detachAttachmentMenuItem.label    "vyčleniť…">
 <!ENTITY detachAttachmentMenuItem.accesskey    "v">
 <!ENTITY deleteAttachmentMenuItem.label    "odstrániť">
 <!ENTITY deleteAttachmentMenuItem.accesskey    "d">
+<!ENTITY openAllAttachmentsMenuItem.label    "otvoriť všetky prílohy…">
+<!ENTITY openAllAttachmentsMenuItem.accesskey    "o">
 <!ENTITY saveAllAttachmentsMenuItem.label    "uložiť všetky prílohy…">
 <!ENTITY saveAllAttachmentsMenuItem.accesskey    "u">
 <!ENTITY detachAllAttachmentsMenuItem.label    "vyčleniť všetky prílohy…">
-<!ENTITY detachAllAttachmentsMenuItem.accesskey    "e">
+<!ENTITY detachAllAttachmentsMenuItem.accesskey    "v">
 <!ENTITY deleteAllAttachmentsMenuItem.label    "odstrániť všetky prílohy…">
-<!ENTITY deleteAllAttachmentsMenuItem.accesskey    "s">
+<!ENTITY deleteAllAttachmentsMenuItem.accesskey    "d">
 
 <!ENTITY copyLinkCmd.label "Kopírovať adresu odkazu">
 <!ENTITY copyLinkCmd.accesskey "K">
 
 <!ENTITY CopyMessageId.label "Kopírovať ID správy">
 <!ENTITY OpenMessageForMsgId.label "Otvoriť správu pre ID">
 <!ENTITY OpenBrowserWithMsgId.label "Otvoriť prehliadač s ID správy">
--- a/other-licenses/branding/thunderbird/brand.dtd
+++ b/other-licenses/branding/thunderbird/brand.dtd
@@ -1,4 +1,4 @@
 <!ENTITY  brandShortName        "Thunderbird">
 <!ENTITY  brandFullName         "Mozilla Thunderbird">
 <!ENTITY  vendorShortName       "Mozilla">
-<!ENTITY  logoTrademark         "Mozilla Thunderbird a logá Thunderbird sú ochranné známky patriace Mozilla Foundation.">
+<!ENTITY  trademarkInfo.part1   "Mozilla Thunderbird a logá Thunderbird sú ochranné známky patriace Mozilla Foundation.">
deleted file mode 100644
--- a/suite/chrome/browser/mac/navigator.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-# moved from navigator/locale/navigator.properties
-intl.charset.default=ISO-8859-2
-
--- a/suite/chrome/browser/navigator.dtd
+++ b/suite/chrome/browser/navigator.dtd
@@ -35,19 +35,16 @@
 <!ENTITY printSetupCmd.label "Nastavenie tlače…">
 <!ENTITY printSetupCmd.accesskey "N">
 <!ENTITY printPreviewCmd.label "Ukážka pred tlačou">
 <!ENTITY printPreviewCmd.accesskey "e">
 <!ENTITY printCmd.label "Tlačiť…">
 <!ENTITY printCmd.accesskey "T">
 <!ENTITY printCmd.commandkey "p">
 
-<!ENTITY viewMenu.label "Zobraziť">
-<!ENTITY viewMenu.accesskey "Z">
-
 <!ENTITY toolbarsCmd.label "Zobraziť/Skryť">
 <!ENTITY toolbarsCmd.accesskey "Z">
 <!ENTITY navbarCmd.label "Navigačný panel">
 <!ENTITY navbarCmd.accesskey "N">
 <!ENTITY personalbarCmd.label "Osobný panel">
 <!ENTITY personalbarCmd.accesskey "O">
 <!ENTITY tabbarCmd.label "Panel kariet">
 <!ENTITY tabbarCmd.accesskey "e">
--- a/suite/chrome/browser/navigator.properties
+++ b/suite/chrome/browser/navigator.properties
@@ -36,34 +36,16 @@ tabs.recentlyClosed.format=%1$S %2$S
 windows.recentlyClosed.format=%1$S %2$S
 
 tabs.closeWarningTitle=Potvrdenie zatvorenia
 tabs.closeWarning=V tomto okne prehliadača je otvorených niekoľko kariet (celkom %S). Chcete ho zavrieť spolu so všetkými kartami?
 tabs.closeButton=Zavrieť všetky karty
 tabs.closeWarningPromptMe=Upozorniť vždy, keď sa pokúšam zavrieť viac kariet naraz
 tabs.historyItem=Skupina kariet
 
-# LOCALIZATION NOTE (lwthemeInstallRequest.message): %S will be replaced with
-# the host name of the site.
-lwthemeInstallRequest.message=Táto stránka (%S) sa pokúša nainštalovať tému.
-lwthemeInstallRequest.allowButton=Povoliť
-lwthemeInstallRequest.allowButton.accesskey=v
-
-lwthemePostInstallNotification.message=Bola nainštalovaná nová téma.
-lwthemePostInstallNotification.undoButton=Vrátiť späť
-lwthemePostInstallNotification.undoButton.accesskey=V
-lwthemePostInstallNotification.manageButton=Správa tém…
-lwthemePostInstallNotification.manageButton.accesskey=m
-
-# LOCALIZATION NOTE (lwthemeNeedsRestart.message):
-# %S will be replaced with the new theme name.
-lwthemeNeedsRestart.message=Téma %S bude nainštalovaná po reštarte.
-lwthemeNeedsRestart.restartButton=Reštartovať
-lwthemeNeedsRestart.restartButton.accesskey=R
-
 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"
deleted file mode 100644
--- a/suite/chrome/browser/unix/navigator.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-# moved from navigator/locale/navigator.properties
-intl.charset.default=ISO-8859-2
-
deleted file mode 100644
--- a/suite/chrome/browser/win/navigator.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-# moved from navigator/locale/navigator.properties
-intl.charset.default=ISO-8859-2
-
--- a/suite/chrome/common/bookmarks/places.dtd
+++ b/suite/chrome/common/bookmarks/places.dtd
@@ -94,17 +94,18 @@
 <!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.more.accesskey "V">
+<!ENTITY detailsPane.fewer.label "Menej">
+<!ENTITY detailsPane.fewer.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">
 
--- a/suite/chrome/common/contentAreaCommands.dtd
+++ b/suite/chrome/common/contentAreaCommands.dtd
@@ -71,42 +71,28 @@
 <!ENTITY saveLinkCmd.accesskey        "d">
 <!ENTITY saveImageAsCmd.label         "Uložiť obrázok ako…">
 <!ENTITY saveImageCmd.label           "Uložiť obrázok">
 <!ENTITY saveImageCmd.accesskey       "l">
 <!ENTITY saveVideoCmd.label           "Uložiť video ako…">
 <!ENTITY saveVideoCmd.accesskey       "d">
 <!ENTITY saveAudioCmd.label           "Uložiť zvuk ako…">
 <!ENTITY saveAudioCmd.accesskey       "l">
-<!ENTITY copyCmd.label                "Kopírovať">
-<!ENTITY copyCmd.accesskey            "K">
-<!ENTITY selectAllCmd.label           "Vybrať všetko">
-<!ENTITY selectAllCmd.accesskey       "a">
 <!ENTITY copyLinkCmd.label            "Kopírovať adresu odkazu">
 <!ENTITY copyLinkCmd.accesskey        "u">
 <!ENTITY copyImageCmd.label           "Kopírovať obrázok">
 <!ENTITY copyImageCmd.accesskey       "a">
 <!ENTITY copyVideoURLCmd.label        "Kopírovať adresu videa">
 <!ENTITY copyVideoURLCmd.accesskey    "a">
 <!ENTITY copyAudioURLCmd.label        "Kopírovať adresu zvuku">
 <!ENTITY copyAudioURLCmd.accesskey    "a">
 <!ENTITY metadataCmd.label            "Vlastnosti">
 <!ENTITY metadataCmd.accesskey        "V">
 <!ENTITY copyEmailCmd.label           "Kopírovať e-mailovú adresu">
 <!ENTITY copyEmailCmd.accesskey       "e">
-<!ENTITY pasteCmd.label               "Prilepiť">
-<!ENTITY pasteCmd.accesskey           "P">
-<!ENTITY cutCmd.label                 "Vystrihnúť">
-<!ENTITY cutCmd.accesskey             "V">
-<!ENTITY deleteCmd.label              "Odstrániť">
-<!ENTITY deleteCmd.accesskey          "d">
-<!ENTITY undoCmd.label                "Späť">
-<!ENTITY undoCmd.accesskey            "S">
-<!ENTITY redoCmd.label                "Dopredu">
-<!ENTITY redoCmd.accesskey            "D">
 <!ENTITY thisFrameMenu.label          "Tento rámec">
 <!ENTITY thisFrameMenu.accesskey      "T">
 <!ENTITY mediaPlay.label              "Prehrať">
 <!ENTITY mediaPlay.accesskey          "P">
 <!ENTITY mediaPause.label             "Pozastaviť">
 <!ENTITY mediaPause.accesskey         "P">
 <!ENTITY mediaMute.label              "Stlmiť">
 <!ENTITY mediaMute.accesskey          "m">
--- a/suite/chrome/common/help/cs_nav_prefs_advanced.xhtml
+++ b/suite/chrome/common/help/cs_nav_prefs_advanced.xhtml
@@ -423,97 +423,92 @@
 
 <ol>
   <li>Open the <span class="mac">&brandShortName;</span>
     <span class="noMac">Edit</span> menu and choose Preferences.</li>
   <li>Under the Advanced category, click Software Installation. (If no
     subcategories are visible, double-click Advanced to expand the list.)</li>
 </ol>
 
-<p>The Software Installation preferences panel is used to enable software
-  installation and update notification:</p>
+<p>The Software Installation preferences panel is used to enable add-on
+  installation and updates. The Add-on Manager allows you to view and manage
+  all your installed extensions and themes.</p>
 
 <ul>
-  <li><strong>Allow websites to install extensions and updates</strong>:
-    Select this if you want to allow websites to install extensions and
-    updates to be used with &brandShortName;. You will be prompted before each
-    installation.</li>
-  <li><strong>Allowed Websites</strong>: Click this to open the Allowed Websites
-    dialog box, where you can view and edit the list of websites that you
-    want to allow to install software:
+  <li><strong>Add-ons</strong>:
     <ul>
-      <li><strong>Allow</strong>: Click this to add a typed website to the
-        list of allowed websites.</li>
-      <li><strong>Remove Website</strong>: Click this to remove a selected
-        website.</li>
-      <li><strong>Remove All Websites</strong>: Click this to remove all of the
-        websites in the current list.</li>
-    </ul>
-  </li>
-  <li><strong>Add-on Manager</strong>: Using the Add-on Manager, you can view
-    and manage all your installed extensions and themes.
-    <ul>
+      <li><strong>Allow websites to install add-ons and updates</strong>:
+        Select this if you want to allow websites to install add-ons and
+        updates to be used with &brandShortName;. You will be prompted before
+        each installation.
+        <ul>
+          <li><strong>Allowed Websites</strong>: Click this link to open the
+            Data Manager tab, where you can view and edit the list of websites
+            that you want to allow to install software</li>
+          <li><strong>Automatically check for updates</strong>:Select this to
+            be notified when a new version of one of your installed add-ons is
+            available. Choose whether you want &brandShortName; to do a
+            <strong>daily</strong> or a <strong>weekly</strong> check for new
+            versions.</li>
+          <li><strong>Automatically download and install the update</strong>:
+            Select this if you want &brandShortName; to automatically download
+            and install updates for you when they become available. The download
+            will happen in the background, with low priority. After the download
+            has finished the update to the add-on will be installed
+            automatically the next time you start &brandShortName;.</li>
+        </ul>
+      </li>
       <li><strong>Personalize Add-on recommendations</strong>: Select this to
         be offered suggestions for add-ons in the &quot;Get Add-ons&quot; tab
         of the manager:
         <ul>
           <li>Note that this function involves sending a list of your
             currently installed add-ons to the add-on web site.</li>
           <li>Disabling this option will also suppress contacting the add-on
             site periodically for any new information about installed add-ons,
             but won't affect automated updates.</li>
         </ul>
       </li>
       <li><strong>Manage Add-ons</strong>: Click this link to open the Add-on
         Manager in a new browser tab.</li>
     </ul>
   </li>
-  <li><strong>Automatically check for updates to</strong>:
+  <li><strong>&brandShortName;</strong>:
     <ul>
-      <li><strong>&brandShortName;</strong>: Select this to be notified when
-        new versions of &brandShortName; are available. Your personal
-        information is not shared when verifying your version of
-        &brandShortName;. Choose whether you want &brandShortName; to do a
-        <strong>daily</strong> or a <strong>weekly</strong> check for new
-        versions.</li>
-      <li><strong>Installed Add-ons</strong>: Select this to be notified when a
-        new version of one of your installed add-ons is available. Choose
-        whether you want &brandShortName; to do a <strong>daily</strong> or a
-        <strong>weekly</strong> check for new versions.</li>
+      <li><strong>Automatically check for updates</strong>:Select this to be
+        notified when a new version of &brandShortName; is available. Choose
+        whether you want &brandShortName; to do a <strong>daily</strong> or
+        a <strong>weekly</strong> check for new versions.
+        <ul>
+          <li><strong>Automatically download and install the update</strong>:
+            Select this if you want &brandShortName; to automatically download
+            and install updates for you when they become available. The download
+            will happen in the background, with low priority. After the download
+            has finished the update to &brandShortName; will be installed
+            automatically the next time you start it.</li>
+          <li><strong>Warn me if this will disable any of my add-ons</strong>:
+            Select this to be notified if an automatic update will disable any
+            of your installed add-ons. In that case you will be shown a list
+            of incompatible add-ons and you can choose whether you want to
+            download and install the update or not.</li>
+        </ul>
+        <p><strong>Note</strong>: You can use Check for Updates from the
+          <span class="mac">&brandShortName;</span><span class="noMac">Help</span>
+          menu to manually initiate the search for a &brandShortName; update.
+          <span class="noMac">The label of the menu item will change when an
+          update is being downloaded or ready to be applied.</span></p>
+      </li>
+      <li><strong>Show Update History…</strong>: Click this to open the Update
+        History dialog box which shows a list of &brandShortName; updates that
+        have been installed, including the update type (e.g. Security Update),
+        time of installation and installation status. The Details link next to
+        each update takes you to a web page that contains further information
+        regarding the update.</li>
     </ul>
   </li>
-  <li><strong>When updates to &brandShortName; are found</strong>:
-    <ul>
-      <li><strong>Ask me what I want to do</strong>: Select this to be notified
-        when new versions of &brandShortName; are available.</li>
-      <li><strong>Automatically download and install the update</strong>: Select
-        this if you want &brandShortName; to automatically download and install
-        updates for you when they become available. The download will happen in
-        the background, with low priority. After the download has finished the
-        update will be installed automatically the next time you start
-        &brandShortName;.</li>
-      <li><strong>Warn me if this will disable any of my add-ons</strong>:
-        Select this to be notified if an automatic update will disable any of
-        your installed add-ons. In that case you will be shown a list of
-        incompatible add-ons and you can choose whether you want to download and
-        install the update or not.</li>
-    </ul>
-
-    <p><strong>Note</strong>: You can use Check for Updates from the
-      <span class="mac">&brandShortName;</span><span class="noMac">Help</span>
-      menu to manually initiate the search for a &brandShortName; update.
-      <span class="noMac">The label of the menu item will change when an update
-      is being downloaded or ready to be applied.</span></p>
-  </li>
-  <li><strong>Show Update History</strong>: Click this to open the Update
-    History dialog box which shows a list of &brandShortName; updates that have
-    been installed, including the update type (e.g. Security Update), time of
-    installation and installation status. The Details link next to each update
-    takes you to a web page that contains further information regarding the
-    update.</li>
 </ul>
 
 <p>[<a href="#advanced_preferences">Return to beginning of section</a>]</p>
 
 <h2 id="mouse_wheel">Advanced Preferences - Mouse Wheel</h2>
 
 <p>This section describes how to use the Mouse Wheel preferences panel. If
   you&apos;re not already viewing it, follow these steps:</p>
--- a/suite/chrome/common/mac/platformCommunicatorOverlay.dtd
+++ b/suite/chrome/common/mac/platformCommunicatorOverlay.dtd
@@ -22,17 +22,16 @@
 <!-- End of Application menu -->
 
 <!ENTITY closeCmd.label                 "Zavrieť">
 <!ENTITY closeCmd.key                   "W">
 
 <!ENTITY printSetupCmd.label            "Nastavenie tlače…">
 <!ENTITY printSetupCmd.accesskey        "N">
 
-<!ENTITY redoCmd.label                  "Znovu">
 <!ENTITY redoCmd.key                    "Z">
 
 <!ENTITY historyCmd.key                 "H">
 
 <!ENTITY findTypeTextCmd.key            "">
 <!ENTITY findTypeLinksCmd.key           "">
 
 <!ENTITY accel.emacs_conflict           "accel">
--- a/suite/chrome/common/notification.properties
+++ b/suite/chrome/common/notification.properties
@@ -61,18 +61,37 @@ addonInstallManageButton.accesskey=d
 
 # LOCALIZATION NOTE (addonError-1, addonError-2, addonError-3, addonError-4, addonErrorIncompatible, addonErrorBlocklisted):
 # #1 is the add-on name, #2 is the host name, #3 is the application name
 # #4 is the application version
 addonError-1=Doplnok nemohol byť prevzatý kvôli problémom s pripojením k #2.
 addonError-2=Doplnok zo stránky #2 nemohol byť nainštalovaný, pretože neodpovedá tomu, čo prehliadač #3 očakával.
 addonError-3=Doplnok prevzatý zo stránky #2 nemohol byť nainštalovaný, pretože je zrejme poškodený.
 addonError-4=Doplnok #1 nemohol byť nainštalovaný, pretože #3 nemohol upraviť potrebný súbor.
+addonErrorBlocklisted=Doplnok #1 nebol byť nainštalovaný, pretože je veľké riziko, že spôsobí problémy so stabilitou alebo bezpečnosťou prehliadača.
 addonErrorIncompatible=Doplnok #1 nemohol byť nainštalovaný, pretože nie je kompatibilný s prehliadačom #3 #4.
-addonErrorBlocklisted=Doplnok #1 nebol byť nainštalovaný, pretože je veľké riziko, že spôsobí problémy so stabilitou alebo bezpečnosťou prehliadača.
+
+# Light Weight Themes
+# LOCALIZATION NOTE (lwthemeInstallRequest.message): %S will be replaced with
+# the host name of the site.
+lwthemeInstallRequest.message=Táto stránka (%S) sa pokúša nainštalovať tému. Kliknutím na tlačidlo Povoliť ju nainštalujete.
+lwthemeInstallRequest.allowButton=Povoliť
+lwthemeInstallRequest.allowButton.accesskey=v
+
+lwthemeInstallNotification.message=Bola nainštalovaná nová téma.
+lwthemeInstallNotification.undoButton=Vrátiť späť
+lwthemeInstallNotification.undoButton.accesskey=V
+lwthemeInstallNotification.manageButton=Správa tém…
+lwthemeInstallNotification.manageButton.accesskey=m
+
+# LOCALIZATION NOTE (lwthemeNeedsRestart.message):
+# %S will be replaced with the new theme name.
+lwthemeNeedsRestart.message=Téma %S bude nainštalovaná po reštarte.
+lwthemeNeedsRestart.restartButton=Reštartovať
+lwthemeNeedsRestart.restartButton.accesskey=R
 
 # 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.
 geolocation.shareLocation=Prezradiť polohu
 geolocation.shareLocation.accesskey=e
 geolocation.dontShareLocation=Neprezradiť
 geolocation.dontShareLocation.accesskey=a
--- a/suite/chrome/common/pref/pref-search.dtd
+++ b/suite/chrome/common/pref/pref-search.dtd
@@ -9,12 +9,11 @@
 
 <!ENTITY openInTab.label                  "Výsledky vyhľadávania v bočnom paneli otvárať na novej karte">
 <!ENTITY openInTab.accesskey              "V">
 <!ENTITY openContextSearchTab.label       "Výsledky vyhľadávania pomocou kontextovej ponuky otvárať na novej karte">
 <!ENTITY openContextSearchTab.accesskey   "s">
 <!ENTITY openSidebarSearchPanel.label     "Pri spustení vyhľadávania otvoriť v bočnom paneli kartu Vyhľadávanie">
 <!ENTITY openSidebarSearchPanel.accesskey "r">
 
-<!-- Will be used by bug 595246 -->
 <!ENTITY engineManager.label              "Správa vyhľadávacích modulov…">
 
 <!ENTITY searchResults.label              "Výsledky vyhľadávania">
--- a/suite/chrome/common/search/search-panel.dtd
+++ b/suite/chrome/common/search/search-panel.dtd
@@ -33,10 +33,9 @@
    - 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 search.button.label      "Hľadať">
 <!ENTITY search.placeholder       "Zadajte hľadaný text">
 
-<!-- Will be used by bug 595246 -->
 <!ENTITY search.engineManager.label "Správa vyhľadávacích modulov…">
--- a/suite/chrome/common/tasksOverlay.dtd
+++ b/suite/chrome/common/tasksOverlay.dtd
@@ -34,19 +34,19 @@
 
 <!ENTITY passwordExpireCmd.label "Odhlásiť sa">
 <!ENTITY passwordExpireCmd.accesskey "O">
 
 <!ENTITY downloadManagerCmd.label "Správca preberania súborov">
 <!ENTITY downloadManagerCmd.accesskey "S">
 <!ENTITY downloadManagerCmd.commandkey "j">
 
-<!ENTITY addonsManagerCmd.label "Doplnky">
-<!ENTITY addonsManagerCmd.accesskey "D">
-<!ENTITY addonsManagerCmd.commandkey "a">
+<!ENTITY addOnsManagerCmd.label "Doplnky">
+<!ENTITY addOnsManagerCmd.accesskey "D">
+<!ENTITY addOnsManagerCmd.commandkey "a">
 
 <!ENTITY switchProfileCmd.label "Prepnúť profil…">
 <!ENTITY switchProfileCmd.accesskey "r">
 
 <!ENTITY syncBrand.shortName.label "Sync">
 <!-- LOCALIZATION NOTE (syncSetup.accesskey, syncSyncNowItem.accesskey):
      Only one of these will show at a time (based on setup state),
      so reusing accesskey is ok. -->
--- a/suite/chrome/common/unix/platformCommunicatorOverlay.dtd
+++ b/suite/chrome/common/unix/platformCommunicatorOverlay.dtd
@@ -4,19 +4,17 @@
 <!ENTITY closeCmd.label                 "Zavrieť">
 <!ENTITY closeCmd.key                   "W">
 <!ENTITY closeCmd.accesskey             "Z">
 
 <!ENTITY quitApplicationCmd.label       "Koniec">
 <!ENTITY quitApplicationCmd.key         "q">
 <!ENTITY quitApplicationCmd.accesskey   "K">
 
-<!ENTITY redoCmd.label                  "Znovu">
 <!ENTITY redoCmd.key                    "Y">
-<!ENTITY redoCmd.accesskey              "Z">
 
 <!ENTITY findTypeTextCmd.key            "/">
 <!ENTITY findTypeLinksCmd.key           "'">
 
 <!ENTITY accel.emacs_conflict           "accel,shift">
 
 <!-- Help viewer -->
 <!ENTITY openHelpCmd.label              "Obsah Pomocníka">
--- a/suite/chrome/common/utilityOverlay.dtd
+++ b/suite/chrome/common/utilityOverlay.dtd
@@ -1,58 +1,58 @@
 <!-- these things need to move into utilityOverlay.xul -->
 <!ENTITY  offlineGoOfflineCmd.label                 "Pracovať offline">
 <!ENTITY  offlineGoOfflineCmd.accesskey             "f">
 
 <!-- LOCALIZATION NOTE : FILE This file contains the global menu items -->
 
-<!ENTITY fileMenu.label "Súbor">
-<!ENTITY fileMenu.accesskey "S">
-<!ENTITY newMenu.label "Nový objekt">
-<!ENTITY newMenu.accesskey "b">
-<!ENTITY newBlankPageCmd.label "Prázdna stránka">
-<!ENTITY newBlankPageCmd.accesskey "r" >
-<!ENTITY newBlankPageCmd.key "n" >
+<!ENTITY fileMenu.label                   "Súbor">
+<!ENTITY fileMenu.accesskey               "F">
+<!ENTITY newMenu.label                    "Nový objekt">
+<!ENTITY newMenu.accesskey                "b">
+<!ENTITY newBlankPageCmd.label            "Stránka v Composeri">
+<!ENTITY newBlankPageCmd.accesskey        "r">
+<!ENTITY newBlankPageCmd.key              "n">
 <!ENTITY newPageFromTemplateCmd.label "Stránka s použitím šablóny">
 <!ENTITY newPageFromTemplateCmd.accesskey "t">
 <!ENTITY newPageFromDraftCmd.label "Stránka z konceptu">
 <!ENTITY newPageFromDraftCmd.accesskey "k">
 <!ENTITY newNavigatorCmd.label "Okno prehliadača">
 <!ENTITY newNavigatorCmd.key "n">
 <!ENTITY newNavigatorCmd.accesskey "O">
 
-<!ENTITY editMenu.label "Upraviť">
-<!ENTITY editMenu.accesskey "U">
-<!ENTITY undoCmd.label "Späť">
-<!ENTITY undoCmd.key "Z">
-<!ENTITY undoCmd.accesskey "S">
-<!ENTITY redoCmd.label "Znovu">
-<!ENTITY redoCmd.key "Y">
-<!ENTITY redoCmd.accesskey "Z">
-<!ENTITY cutCmd.label "Vystrihnúť">
-<!ENTITY cutCmd.key "X">
-<!ENTITY cutCmd.accesskey "V">
-<!ENTITY copyCmd.label "Kopírovať">
-<!ENTITY copyCmd.key "C">
-<!ENTITY copyCmd.accesskey "K">
-<!ENTITY pasteCmd.label "Prilepiť">
-<!ENTITY pasteCmd.key "V">
-<!ENTITY pasteCmd.accesskey "P">
-<!ENTITY pasteGoCmd.label					"Prilepiť a prejsť">
-<!ENTITY pasteGoCmd.accesskey				"r">
+<!ENTITY editMenu.label                   "Upraviť">
+<!ENTITY editMenu.accesskey               "U">
+<!ENTITY undoCmd.label                    "Späť">
+<!ENTITY undoCmd.key                      "Z">
+<!ENTITY undoCmd.accesskey                "S">
+<!ENTITY redoCmd.label                    "Znovu">
+<!ENTITY redoCmd.key                      "Y">
+<!ENTITY redoCmd.accesskey                "Z">
+<!ENTITY cutCmd.label                     "Vystrihnúť">
+<!ENTITY cutCmd.key                       "X">
+<!ENTITY cutCmd.accesskey                 "V">
+<!ENTITY copyCmd.label                    "Kopírovať">
+<!ENTITY copyCmd.key                      "C">
+<!ENTITY copyCmd.accesskey                "K">
+<!ENTITY pasteCmd.label                   "Prilepiť">
+<!ENTITY pasteCmd.key                     "V">
+<!ENTITY pasteCmd.accesskey               "P">
+<!ENTITY pasteGoCmd.label                 "Prilepiť a prejsť">
+<!ENTITY pasteGoCmd.accesskey             "r">
 
 <!-- LOCALIZATION NOTE (pasteSearchCmd): "Search" is a verb, this is the
-     search bar equivalent to the url bar's "Paste & Go"  --> 
-<!ENTITY pasteSearchCmd.label				"Prilepiť a vyhľadať">
-<!ENTITY pasteSearchCmd.accesskey			"r">
-<!ENTITY deleteCmd.label "Odstrániť">
-<!ENTITY deleteCmd.accesskey "O">
-<!ENTITY selectAllCmd.label "Vybrať všetko">
-<!ENTITY selectAllCmd.key "A">
-<!ENTITY selectAllCmd.accesskey "a">
+     search bar equivalent to the url bar's "Paste & Go"  -->
+<!ENTITY pasteSearchCmd.label             "Prilepiť a vyhľadať">
+<!ENTITY pasteSearchCmd.accesskey         "r">
+<!ENTITY deleteCmd.label                  "Odstrániť">
+<!ENTITY deleteCmd.accesskey              "O">
+<!ENTITY selectAllCmd.label               "Vybrať všetko">
+<!ENTITY selectAllCmd.key                 "A">
+<!ENTITY selectAllCmd.accesskey           "a">
 <!ENTITY clearHistoryCmd.label				"Vymazať históriu hľadania">  
 <!ENTITY clearHistoryCmd.accesskey			"h"> 
 <!ENTITY showSuggestionsCmd.label			"Zobrazovať návrhy">  
 <!ENTITY showSuggestionsCmd.accesskey		"n"> 
 <!ENTITY preferencesCmd.label "Možnosti…">
 <!ENTITY preferencesCmd.key					"E">
 <!ENTITY preferencesCmd.accesskey "M">
 <!ENTITY findTypeTextCmd.label "Hľadať počas písania textu na stránke">
@@ -67,20 +67,22 @@
 <!ENTITY showTaskbarCmd.label "Stavový riadok">
 <!ENTITY showTaskbarCmd.accesskey "S">
 
 <!ENTITY helpMenu.label					"Pomocník">
 <!ENTITY helpMenu.accesskey			"P">
 
 <!ENTITY helpTroubleshootingInfo.label      "Informácie pre riešenie problémov">
 <!ENTITY helpTroubleshootingInfo.accesskey  "n">
-<!ENTITY releaseCmd.label				"Poznámky k vydaniu">
-<!ENTITY releaseCmd.accesskey   "P">
-<!ENTITY updateCmd.label        "Kontrola aktualizácií…">
-<!ENTITY updateCmd.accesskey    "a">
+<!ENTITY releaseCmd.label                   "Poznámky k vydaniu">
+<!ENTITY releaseCmd.accesskey               "P">
+<!ENTITY helpSafeMode.label                 "Reštartovať a zakázať doplnky">
+<!ENTITY helpSafeMode.accesskey             "R">
+<!ENTITY updateCmd.label                    "Kontrola aktualizácií…">
+<!ENTITY updateCmd.accesskey                "a">
 <!ENTITY aboutCmd.label					"O programe &brandShortName;">
 <!ENTITY aboutCmd.accesskey				"m">
 <!ENTITY aboutCommPluginsCmd.label			"O zásuvných moduloch">
 <!ENTITY aboutCommPluginsCmd.accesskey			"z">
 
 <!ENTITY direct.label                             "Online (proxy: žiadne)">
 <!ENTITY direct.accesskey                         "n">
 <!ENTITY manual.label                             "Online (proxy: ručné)">
--- a/suite/chrome/common/utilityOverlay.properties
+++ b/suite/chrome/common/utilityOverlay.properties
@@ -18,8 +18,14 @@ updatesItem_downloading=Preberá sa %S…
 updatesItem_downloadingFallback=Preberá sa aktualizácia…
 updatesItem_downloadingAccessKey=b
 updatesItem_resume=Pokračovať v preberaní %S…
 updatesItem_resumeFallback=Pokračovať v preberaní aktualizácie…
 updatesItem_resumeAccessKey=b
 updatesItem_pending=Nainštalovať prevzaté aktualizácie…
 updatesItem_pendingFallback=Nainštalovať prevzaté aktualizácie…
 updatesItem_pendingAccessKey=N
+
+# safeModeRestart
+safeModeRestartPromptTitle=Reštart a zakázanie doplnkov
+safeModeRestartPromptMessage=Naozaj chcete zakázať všetky doplnky a reštartovať?
+safeModeRestartButton=Reštartovať
+safeModeRestartCheckbox=Reštartovať a zakázať doplnky
--- a/suite/chrome/common/win/platformCommunicatorOverlay.dtd
+++ b/suite/chrome/common/win/platformCommunicatorOverlay.dtd
@@ -5,19 +5,17 @@
 <!ENTITY closeCmd.label                 "Zavrieť">
 <!ENTITY closeCmd.key                   "W">
 <!ENTITY closeCmd.accesskey             "Z">
 
 <!ENTITY quitApplicationCmd.label       "Koniec">
 <!ENTITY quitApplicationCmd.key         "Q">
 <!ENTITY quitApplicationCmd.accesskey   "K">
 
-<!ENTITY redoCmd.label                  "Znovu">
 <!ENTITY redoCmd.key                    "Y">
-<!ENTITY redoCmd.accesskey              "Z">
 
 <!ENTITY findTypeTextCmd.key            "/">
 <!ENTITY findTypeLinksCmd.key           "'">
 
 <!ENTITY accel.emacs_conflict           "accel">
 
 <!-- Help viewer -->
 <!ENTITY openHelpCmd.label              "Obsah pomocníka">
--- a/suite/chrome/mailnews/FilterEditor.dtd
+++ b/suite/chrome/mailnews/FilterEditor.dtd
@@ -79,17 +79,16 @@
 
 <!-- New Style Filter Rule Actions -->
 <!ENTITY moveMessage.label "Presunúť do priečinka">
 <!ENTITY copyMessage.label "Kopírovať do priečinka">
 <!ENTITY forwardTo.label "Odoslať ďalej komu">
 <!ENTITY replyWithTemplate.label "Odpovedať pomocou šablóny">
 <!ENTITY markMessageRead.label "Označiť ako prečítané">
 <!ENTITY markMessageStarred.label "Pridať vlajku">
-<!ENTITY labelMessage.label "Označiť správu ako">
 <!ENTITY setPriority.label "Zmeniť prioritu na">
 <!ENTITY addTag.label "Priradiť správe popis">
 <!ENTITY setJunkScore.label "Nastaviť druh správy na">
 <!ENTITY deleteMessage.label "Odstrániť správu">
 <!ENTITY deleteFromPOP.label "Odstrániť zo servera POP">
 <!ENTITY fetchFromPOP.label "Prevziať telo správy zo servera POP">
 <!ENTITY ignoreThread.label "Ignorovať vlákno">
 <!ENTITY ignoreSubthread.label "Ignorovať podvlákno">
--- a/suite/chrome/mailnews/compose/messengercompose.dtd
+++ b/suite/chrome/mailnews/compose/messengercompose.dtd
@@ -140,31 +140,21 @@
 <!ENTITY stopButton.tooltip "Zastaviť aktuálny prenos">
 
 <!-- context menu items -->
 <!ENTITY spellCheckNoSuggestions.label "Neboli nájdené žiadne návrhy">
 <!ENTITY spellCheckIgnoreWord.label "Ignorovať slovo">
 <!ENTITY spellCheckIgnoreWord.accesskey "I">
 <!ENTITY spellCheckAddToDictionary.label "Pridať do slovníka">
 <!ENTITY spellCheckAddToDictionary.accesskey "n">
-<!ENTITY undo.label "Späť">
-<!ENTITY undo.accesskey "S">
-<!ENTITY cut.label "Vystrihnúť">
-<!ENTITY cut.accesskey "V">
-<!ENTITY copy.label "Kopírovať">
-<!ENTITY copy.accesskey "K">
-<!ENTITY paste.label "Prilepiť">
-<!ENTITY paste.accesskey "P">
 <!ENTITY pasteQuote.label "Prilepiť ako citát">
 <!ENTITY pasteQuote.accesskey "c">
 
 <!ENTITY openAttachment.label "Otvoriť">
 <!ENTITY openAttachment.accesskey "O">
-<!ENTITY delete.label "Odstrániť">
-<!ENTITY delete.accesskey "d">
 <!ENTITY renameAttachment.label "Premenovať…">
 <!ENTITY renameAttachment.accesskey "P">
-<!ENTITY selectAll.label "Vybrať všetko">
-<!ENTITY selectAll.accesskey "a">
+<!ENTITY deleteAttachment.accesskey "d">
+<!ENTITY selectAllAttachments.accesskey "a">
 <!ENTITY attachFile.label "Priložiť súbor…">
 <!ENTITY attachFile.accesskey "s">
 <!ENTITY attachPage.label "Priložiť webovú stránku…">
 <!ENTITY attachPage.accesskey "w">
--- a/suite/chrome/mailnews/messenger.properties
+++ b/suite/chrome/mailnews/messenger.properties
@@ -367,17 +367,19 @@ macBiffNotification_separator=,\u0020
 quotaUsedFree=Využitých %S z %S kB
 quotaPercentUsed=Zaplnené: %S%%
 
 # for message views
 confirmViewDeleteTitle=Potvrdenie odstránenia
 confirmViewDeleteMessage=Naozaj chcete odstrániť tento pohľad?
 
 # for virtual folders
+confirmSavedSearchDeleteTitle=Odstránenie uloženého hľadania
 confirmSavedSearchDeleteMessage=Naozaj chcete odstrániť toto uložené hľadanie?
+confirmSavedSearchDeleteButton=&Odstrániť uložené hľadanie
 
 ## @name ENTER_PASSWORD_PROMPT
 ## @loc None
 # LOCALIZATION NOTE (passwordPrompt): Do not translate the word %S below.
 # Place the word "%S" in your translation where the email address
 # or the username should appear
 passwordPrompt=Zadajte vaše heslo pre %1$S na %2$S:
 
--- a/suite/chrome/mailnews/pref/am-copies.dtd
+++ b/suite/chrome/mailnews/pref/am-copies.dtd
@@ -1,42 +1,46 @@
 <!-- extracted from am-copies.xul -->
 
 <!ENTITY copyAndFolderTitle.label "Kópie a priečinky">
 <!ENTITY sendingPrefix.label "Pri odosielaní správ automaticky:">
 <!ENTITY fccMailFolder.label "Uložiť kópiu do:">
-<!ENTITY fccMailFolder.accesskey "U">
+<!ENTITY fccMailFolder.accesskey "l">
 <!ENTITY fccReplyFollowsParent.label "Umiestniť odpovede v priečinku, v ktorom sa nachádza pôvodná správa">
-<!ENTITY fccReplyFollowsParent.accesskey "m">
+<!ENTITY fccReplyFollowsParent.accesskey "U">
 <!-- LOCALIZATION NOTE (ccAddress.label): do not translate "Cc" in below line -->
 <!ENTITY ccAddress.label "Odoslať kópiu (CC) na tieto adresy:">
 <!ENTITY ccAddress.accesskey "C">
 <!ENTITY ccAddressList.placeholder "Adresy oddelené čiarkami">
 <!-- LOCALIZATION NOTE (bccAddress.label): do not translate "Bcc" in below line -->
 <!ENTITY bccAddress.label "Odoslať Skrytú kópiu (BCC) na tieto adresy:">
 <!ENTITY bccAddress.accesskey "S">
 <!ENTITY bccAddressList.placeholder "Adresy oddelené čiarkami">
 <!ENTITY saveMessageDlg.label "Pri ukladaní správ zobraziť dialógové okno s potvrdením">
 <!ENTITY saveMessageDlg.accesskey "z">
 <!-- LOCALIZATION NOTE (sentFolderOn.label): OK to translate this, bug #57440 -->
 <!ENTITY sentFolderOn.label "priečinok &quot;Odoslaná pošta&quot; v účte:">
 <!ENTITY sentFolderOn.accesskey "d">
 <!ENTITY sentInOtherFolder.label "iný priečinok:">
 <!ENTITY sentInOtherFolder.accesskey "i">
+<!-- LOCALIZATION NOTE (archivesFolderOn.label): OK to translate this, bug #57440 -->
+<!ENTITY archivesTitle.label "Archivovanie správ">
+<!ENTITY keepArchives.label "Archívne správy ukladať do:">
+<!ENTITY keepArchives.accesskey "v">
+<!ENTITY archiveHierarchyButton.label "Možnosti archivácie…">
+<!ENTITY archiveHierarchyButton.accesskey "M">
+<!ENTITY archivesFolderOn.label "priečinok &quot;Archívy&quot; v účte:">
+<!ENTITY archivesFolderOn.accesskey "t">
+<!ENTITY archiveInOtherFolder.label "iný priečinok:">
+<!ENTITY archiveInOtherFolder.accesskey "r">
+<!ENTITY specialFolders.label "Návrhy a šablóny">
+<!ENTITY keepDrafts.label "Návrhy správ ukladať do:">
 <!-- LOCALIZATION NOTE (draftsFolderOn.label): OK to translate this, bug #57440 -->
 <!ENTITY draftsFolderOn.label "priečinok &quot;Návrhy&quot; v účte:">
 <!ENTITY draftsFolderOn.accesskey "h">
 <!ENTITY draftInOtherFolder.label "iný priečinok:">
 <!ENTITY draftInOtherFolder.accesskey "k">
-<!-- LOCALIZATION NOTE (archivesFolderOn.label): OK to translate this, bug #57440 -->
-<!ENTITY archivesFolderOn.label "priečinok &quot;Archívy&quot; v účte:">
-<!ENTITY archivesFolderOn.accesskey "t">
-<!ENTITY archiveInOtherFolder.label "iný priečinok:">
-<!ENTITY archiveInOtherFolder.accesskey "r">
+<!ENTITY keepTemplates.label "Šablóny správ ukladať do:">
 <!-- LOCALIZATION NOTE (templatesFolderOn.label): OK to translate this, bug #57440 -->
 <!ENTITY templatesFolderOn.label "priečinok &quot;Šablóny&quot; v účte:">
 <!ENTITY templatesFolderOn.accesskey "b">
 <!ENTITY templateInOtherFolder.label "iný priečinok:">
 <!ENTITY templateInOtherFolder.accesskey "e">
-<!ENTITY specialFoldersTitle.label "Návrhy, šablóny a archívy">
-<!ENTITY keepDrafts.label "Návrhy správ ukladať do:">
-<!ENTITY keepArchives.label "Archívne správy ukladať do:">
-<!ENTITY keepTempltes.label "Šablóny správ ukladať do:">
deleted file mode 100644
--- a/suite/chrome/mailnews/vcard.properties
+++ /dev/null
@@ -1,355 +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 *****
-
-#
-# The following are used by the vcard content type handler to
-# to emit header display in HTML
-#
-
-# Out of memory
-## @name VCARD_OUT_OF_MEMORY
-## @loc None
--1000=Nedostatok pamäte.
-
-# VCARD_LDAP_REGION
-## @name VCARD_LDAP_REGION
-## @loc None
-1001=Štát
-
-# VCARD_LDAP_DOM_TYPE
-## @name VCARD_LDAP_DOM_TYPE
-## @loc None
-1002=Domáci
-
-# VCARD_LDAP_INTL_TYPE
-## @name VCARD_LDAP_INTL_TYPE
-## @loc None
-1003=Medzinárodný
-
-# VCARD_LDAP_POSTAL_TYPE
-## @name VCARD_LDAP_POSTAL_TYPE
-## @loc None
-1004=PSČ
-
-# VCARD_LDAP_PARCEL_TYPE
-## @name VCARD_LDAP_PARCEL_TYPE
-## @loc None
-1005=Pozemok
-
-# VCARD_LDAP_WORK_TYPE
-## @name VCARD_LDAP_WORK_TYPE
-## @loc None
-1006=Zamestnanie
-
-# VCARD_LDAP_HOME_TYPE
-## @name VCARD_LDAP_HOME_TYPE
-## @loc None
-1007=Domov
-
-# VCARD_LDAP_PREF_TYPE
-## @name VCARD_LDAP_PREF_TYPE
-## @loc None
-1008=Preferovaný
-
-# VCARD_LDAP_VOICE_TYPE
-## @name VCARD_LDAP_VOICE_TYPE
-## @loc None
-1009=Hlas
-
-# VCARD_LDAP_FAX_TYPE
-## @name VCARD_LDAP_FAX_TYPE
-## @loc None
-1010=Fax
-
-# VCARD_LDAP_MSG_TYPE
-## @name VCARD_LDAP_MSG_TYPE
-## @loc None
-1011=Správa
-
-# VCARD_LDAP_CELL_TYPE
-## @name VCARD_LDAP_CELL_TYPE
-## @loc None
-1012=Mobil
-
-# VCARD_LDAP_PAGER_TYPE
-## @name VCARD_LDAP_PAGER_TYPE
-## @loc None
-1013=Pager
-
-# VCARD_LDAP_BBS_TYPE
-## @name VCARD_LDAP_BBS_TYPE
-## @loc None
-1014=BBS
-
-# VCARD_LDAP_MODEM_TYPE
-## @name VCARD_LDAP_MODEM_TYPE
-## @loc None
-1015=Modem
-
-# VCARD_LDAP_CAR_TYPE
-## @name VCARD_LDAP_CAR_TYPE
-## @loc None
-1016=Auto
-
-# VCARD_LDAP_ISDN_TYPE
-## @name VCARD_LDAP_ISDN_TYPE
-## @loc None
-1017=ISDN
-
-# VCARD_LDAP_VIDEO_TYPE
-## @name VCARD_LDAP_VIDEO_TYPE
-## @loc None
-1018=Video
-
-# VCARD_LDAP_AOL_TYPE
-## @name VCARD_LDAP_AOL_TYPE
-## @loc None
-1019=AOL
-
-# VCARD_LDAP_APPLELINK_TYPE
-## @name VCARD_LDAP_APPLELINK_TYPE
-## @loc None
-1020=Applelink
-
-# VCARD_LDAP_ATTMAIL_TYPE
-## @name VCARD_LDAP_ATTMAIL_TYPE
-## @loc None
-1021=AT&T Mail
-
-# VCARD_LDAP_CSI_TYPE
-## @name VCARD_LDAP_CSI_TYPE
-## @loc None
-1022=Compuserve
-
-# VCARD_LDAP_EWORLD_TYPE
-## @name VCARD_LDAP_EWORLD_TYPE
-## @loc None
-1023=eWorld
-
-# VCARD_LDAP_INTERNET_TYPE
-## @name VCARD_LDAP_INTERNET_TYPE
-## @loc None
-1024=Internet
-
-# VCARD_LDAP_IBMMAIL_TYPE
-## @name VCARD_LDAP_IBMMAIL_TYPE
-## @loc None
-1025=IBM Mail
-
-# VCARD_LDAP_MCIMAIL_TYPE
-## @name VCARD_LDAP_MCIMAIL_TYPE
-## @loc None
-1026=MCI Mail
-
-# VCARD_LDAP_POWERSHARE_TYPE
-## @name VCARD_LDAP_POWERSHARE_TYPE
-## @loc None
-1027=Powershare
-
-# VCARD_LDAP_PRODIGY_TYPE
-## @name VCARD_LDAP_PRODIGY_TYPE
-## @loc None
-1028=Prodigy
-
-# VCARD_LDAP_TLX_TYPE
-## @name VCARD_LDAP_TLX_TYPE
-## @loc None
-1029=Telex
-
-# VCARD_LDAP_MIDDLE_NAME
-## @name VCARD_LDAP_MIDDLE_NAME
-## @loc None
-1030=Ďalšie meno
-
-# VCARD_LDAP_NAME_PREFIX
-## @name VCARD_LDAP_NAME_PREFIX
-## @loc None
-1031=Predpona
-
-# VCARD_LDAP_NAME_SUFFIX
-## @name VCARD_LDAP_NAME_SUFFIX
-## @loc None
-1032=Prípona
-
-# VCARD_LDAP_TZ
-## @name VCARD_LDAP_TZ
-## @loc None
-1033=Časová zóna
-
-# VCARD_LDAP_GEO
-## @name VCARD_LDAP_GEO
-## @loc None
-1034=Geografická pozícia
-
-# VCARD_LDAP_SOUND
-## @name VCARD_LDAP_SOUND
-## @loc None
-1035=Zvuk
-
-# VCARD_LDAP_REVISION
-## @name VCARD_LDAP_REVISION
-## @loc None
-1036=Revízia
-
-# VCARD_LDAP_VERSION
-## @name VCARD_LDAP_VERSION
-## @loc None
-1037=Verzia
-
-# VCARD_LDAP_KEY
-## @name VCARD_LDAP_KEY
-## @loc None
-1038=Verejný kľúč
-
-# VCARD_LDAP_LOGO
-## @name VCARD_LDAP_LOGO
-## @loc None
-1039=Logo
-
-# VCARD_LDAP_BIRTHDAY
-## @name VCARD_LDAP_BIRTHDAY
-## @loc None
-1040=Deň narodenia
-
-# VCARD_LDAP_X400
-## @name VCARD_LDAP_X400
-## @loc None
-1041=X400
-
-# VCARD_LDAP_ADDRESS
-## @name VCARD_LDAP_ADDRESS
-## @loc None
-1042=Adresa
-
-# VCARD_LDAP_LABEL
-## @name VCARD_LDAP_LABEL
-## @loc None
-1043=Menovka
-
-# VCARD_LDAP_MAILER
-## @name VCARD_LDAP_MAILER
-## @loc None
-1044=Poštový program
-
-# VCARD_LDAP_ROLE
-## @name VCARD_LDAP_ROLE
-## @loc None
-1045=Rola
-
-# VCARD_LDAP_UPDATEURL
-## @name VCARD_LDAP_UPDATEURL
-## @loc None
-1046=Aktualizovať z
-
-# VCARD_LDAP_COOLTALKADDRESS
-## @name VCARD_LDAP_COOLTALKADDRESS
-## @loc None
-1047=Konferenčná adresa
-
-# VCARD_LDAP_USEHTML
-## @name VCARD_LDAP_USEHTML
-## @loc None
-1048=Pošta HTML
-
-# VCARD_MSG_ADD_TO_ADDR_BOOK
-## @name VCARD_MSG_ADD_TO_ADDR_BOOK
-## @loc None
-1049=Pridať do Osobného adresára
-
-# VCARD_ADDR_ADDINFO
-## @name VCARD_ADDR_ADDINFO
-## @loc None
-1050=Ďalšie informácie:
-
-# VCARD_ADDR_VIEW_COMPLETE_VCARD
-## @name VCARD_ADDR_VIEW_COMPLETE_VCARD
-## @loc None
-1051=Zobraziť úplnú vizitku
-
-# VCARD_ADDR_VIEW_CONDENSED_VCARD
-## @name VCARD_ADDR_VIEW_CONDENSED_VCARD
-## @loc None
-1052=Zobraziť skrátenú vizitku
-
-# VCARD_ADDR_CONFINFO
-## @name VCARD_ADDR_CONFINFO
-## @loc None
-1053=Konferenčná adresa
-
-# VCARD_ADDR_DEFAULT_DLS
-## @name VCARD_ADDR_DEFAULT_DLS
-## @loc None
-1054=Predvolený adresárový server
-
-# VCARD_ADDR_SPECIFIC_DLS
-## @name VCARD_ADDR_SPECIFIC_DLS
-## @loc None
-1055=Špecifický adresárový server
-
-# VCARD_ADDR_HOSTNAMEIP
-## @name VCARD_ADDR_HOSTNAMEIP
-## @loc None
-1056=Počítač alebo adresa IP
-
-# VCARD_LDAP_PHONE_NUMBER
-## @name VCARD_LDAP_PHONE_NUMBER
-## @loc None
-1057=Telefónne číslo
-
-# VCARD_LDAP_PHOTOGRAPH
-## @name VCARD_LDAP_PHOTOGRAPH
-## @loc None
-1058=Foto
-
-# VCARD_LDAP_EMAIL_ADDRESS
-## @name VCARD_LDAP_EMAIL_ADDRESS
-## @loc None
-1059=E-mail
-
-# VCARD_LDAP_SURNAME
-## @name VCARD_LDAP_SURNAME
-## @loc None
-1060=Priezvisko
-
-# VCARD_LDAP_GIVEN_NAME
-## @name VCARD_LDAP_GIVEN_NAME
-## @loc None
-1061=Krstné meno
-
-# VCARD_LDAP_SECRETARY
-## @name VCARD_LDAP_SECRETARY
-## @loc None
-1062=Asistent
--- a/suite/installer/unix/README
+++ b/suite/installer/unix/README
@@ -48,22 +48,21 @@ found at the preceding URL along with th
 ==========================================================================
 
                          System Requirements
 
 ==========================================================================
 
 * Linux
 
-   - The following library versions (or compatible) are required:
-     glibc 2.3.2, X.org 1.x, GTK 2.x, fontconfig, pango 1.10, libstdc++ 6.
+   - The following minimum library versions (or compatible) are required:
+     GTK+ 2.10, GLib 2.12, Pango 1.14, X.Org 1.0.
      Red Hat Enterprise Linux 5, Fedora Core 6, ubuntu 6.10 ("Edgy"),
-     Debian "Lenny" (testing), and openSUSE 10.2 (or later) installations
-     should work.
-   - Intel Pentium class processor (500 MHz or faster recommended)
+     Debian "Lenny", and openSUSE 10.2 (or later) installations should work.
+   - Intel Pentium class processor or better (500 MHz or faster recommended)
    - 128 MB RAM
    - 50 MB free hard disk space
 
 
 ==========================================================================
 
                       Installation Instructions
 
--- a/suite/installer/windows/README.txt
+++ b/suite/installer/windows/README.txt
@@ -46,20 +46,20 @@ found at the preceding URL along with th
 
 
 ==========================================================================
 
                          System Requirements
 
 ==========================================================================
 
-*Windows
+* Windows
 
-   - Windows 2000, XP or Vista
-   - Intel Pentium class processor (500 MHz or faster recommended)
+   - Windows 2000, XP, Server 2003, Vista or 7
+   - Intel Pentium class processor or better (500 MHz or faster recommended)
    - 128 MB RAM
    - 50 MB free hard disk space
 
 
 ==========================================================================
 
                       Installation Instructions