Updates for Thunderbird 3.0b3
authorWalter Leibbrandt <walter@translate.org.za>
Thu, 16 Jul 2009 17:03:27 +0200
changeset 36 c031baea5f5f23378c5ea5d2149c17f76713b427
parent 35 7777aaa242fde8897c58210f6d2a993383aefccf
child 37 4f8628e559aa177737fd25c77f1b1eefd687605e
push id17
push useraxel@mozilla.com
push dateFri, 04 Sep 2009 13:16:15 +0000
Updates for Thunderbird 3.0b3
editor/ui/chrome/composer/editor.properties
editor/ui/chrome/composer/editorOverlay.dtd
editor/ui/chrome/composer/pref-editing.dtd
editor/ui/chrome/dialogs/EdDialogOverlay.dtd
editor/ui/chrome/dialogs/EdNamedAnchorProperties.dtd
editor/ui/chrome/dialogs/EditorButtonProperties.dtd
editor/ui/chrome/dialogs/EditorColorProperties.dtd
editor/ui/chrome/dialogs/EditorFieldSetProperties.dtd
editor/ui/chrome/dialogs/EditorFormProperties.dtd
editor/ui/chrome/dialogs/EditorHLineProperties.dtd
editor/ui/chrome/dialogs/EditorImageProperties.dtd
editor/ui/chrome/dialogs/EditorInputProperties.dtd
editor/ui/chrome/dialogs/EditorLabelProperties.dtd
editor/ui/chrome/dialogs/EditorListProperties.dtd
editor/ui/chrome/dialogs/EditorReplace.dtd
editor/ui/chrome/dialogs/EditorSelectProperties.dtd
editor/ui/chrome/dialogs/EditorSpellCheck.dtd
editor/ui/chrome/dialogs/EditorTableProperties.dtd
editor/ui/chrome/dialogs/EditorTextAreaProperties.dtd
mail/chrome/communicator/utilityOverlay.dtd
mail/chrome/messenger-mapi/mapi.properties
mail/chrome/messenger-newsblog/am-newsblog.dtd
mail/chrome/messenger-newsblog/feed-subscriptions.dtd
mail/chrome/messenger-newsblog/newsblog.properties
mail/chrome/messenger-smime/msgCompSMIMEOverlay.dtd
mail/chrome/messenger-smime/msgReadSMIMEOverlay.dtd
mail/chrome/messenger-smime/msgReadSMIMEOverlay.properties
mail/chrome/messenger-smime/msgSecurityInfo.properties
mail/chrome/messenger/AccountManager.dtd
mail/chrome/messenger/AccountWizard.dtd
mail/chrome/messenger/FilterListDialog.dtd
mail/chrome/messenger/aboutDialog.dtd
mail/chrome/messenger/aboutRights.dtd
mail/chrome/messenger/aboutRights.properties
mail/chrome/messenger/activity.properties
mail/chrome/messenger/addressbook/abCardOverlay.dtd
mail/chrome/messenger/addressbook/abMailListDialog.dtd
mail/chrome/messenger/addressbook/abMainWindow.dtd
mail/chrome/messenger/addressbook/abResultsPaneOverlay.dtd
mail/chrome/messenger/addressbook/addressBook.properties
mail/chrome/messenger/addressbook/pref-directory-add.dtd
mail/chrome/messenger/addressbook/pref-directory.dtd
mail/chrome/messenger/addressbook/replicationProgress.properties
mail/chrome/messenger/am-addressing.dtd
mail/chrome/messenger/am-copies.dtd
mail/chrome/messenger/am-main.dtd
mail/chrome/messenger/am-mdn.dtd
mail/chrome/messenger/am-offline.dtd
mail/chrome/messenger/am-server-advanced.dtd
mail/chrome/messenger/am-server-top.dtd
mail/chrome/messenger/am-serverwithnoidentities.dtd
mail/chrome/messenger/am-smime.dtd
mail/chrome/messenger/appleMailImportMsgs.properties
mail/chrome/messenger/baseMenuOverlay.dtd
mail/chrome/messenger/filter.properties
mail/chrome/messenger/folderProps.dtd
mail/chrome/messenger/imapMsgs.properties
mail/chrome/messenger/localMsgs.properties
mail/chrome/messenger/markByDate.dtd
mail/chrome/messenger/messenger.dtd
mail/chrome/messenger/messenger.properties
mail/chrome/messenger/messengercompose/composeMsgs.properties
mail/chrome/messenger/messengercompose/messengercompose.dtd
mail/chrome/messenger/migration/migration.properties
mail/chrome/messenger/mime.properties
mail/chrome/messenger/msgAccountCentral.dtd
mail/chrome/messenger/msgFolderPickerOverlay.dtd
mail/chrome/messenger/msgHdrViewOverlay.dtd
mail/chrome/messenger/msgViewPickerOverlay.dtd
mail/chrome/messenger/newFolderDialog.dtd
mail/chrome/messenger/news.properties
mail/chrome/messenger/offline.properties
mail/chrome/messenger/preferences/advanced.dtd
mail/chrome/messenger/preferences/compose.dtd
mail/chrome/messenger/preferences/connection.dtd
mail/chrome/messenger/preferences/display.dtd
mail/chrome/messenger/preferences/fonts.dtd
mail/chrome/messenger/preferences/preferences.dtd
mail/chrome/messenger/preferences/preferences.properties
mail/chrome/messenger/preferences/receipts.dtd
mail/chrome/messenger/prefs.properties
mail/chrome/messenger/search-attributes.properties
mail/chrome/messenger/search-operators.properties
mail/chrome/messenger/search.properties
mail/chrome/messenger/searchTermOverlay.dtd
mail/chrome/messenger/shutdownWindow.properties
mail/chrome/messenger/subscribe.dtd
mail/installer/override.properties
mail/updater/updater.ini
--- a/editor/ui/chrome/composer/editor.properties
+++ b/editor/ui/chrome/composer/editor.properties
@@ -32,18 +32,18 @@ InputError=Fout
 Alert=Oppas
 CantEditFramesetMsg=Composer kan nie HTML-raamstelle of bladsye met inlynrame redigeer nie. Vir raamstelle, probeer elke raam apart redigeer. Vir inlynrame, stoor 'n afskrif van die bladsy en verwyder die <iframe>-merker.
 CantEditMimeTypeMsg=Hierdie soort bladsy kan nie geredigeer word nie.
 CantEditDocumentMsg=Hierdie bladsy kan vanweë 'n onbekende rede nie geredigeer word nie.
 BeforeClosing=voor afsluiting
 BeforePreview=before viewing in the browser
 BeforeValidate=voordat die dokument gevalideer word
 # LOCALIZATION NOTE (SaveFilePrompt, PublishPrompt): Don't translate %title% and %reason% (this is the reason for asking user to close, such as "before closing")
-SaveFilePrompt=Stoor wysigings aan "%title%" %reason%?
-PublishPrompt=Stoor wysigings aan "%title%" %reason%?
+SaveFilePrompt=Save changes to "%title%" %reason%? 
+PublishPrompt=Save changes to "%title%" %reason%? 
 SaveFileFailed=Kon lêer nie stoor nie!
 
 # Publishing error strings:
 # LOCALIZATION NOTE Don't translate %dir% or %file% in the Publishing error strings:
 FileNotFound=Kon %file% nie vind nie.
 SubdirDoesNotExist=Die subgids "%dir%" bestaan nie op hierdie webwerf nie, of die lêernaam "%file%" word reeds deur 'n ander subgids gebruik.
 FilenameIsSubdir=Die lêernaam "%file%" word reeds deur 'n ander subgids gebruik.
 ServerNotAvailable=Die bediener is nie beskikbaar nie. Gaan u verbinding na en probeer later weer.
@@ -107,17 +107,17 @@ Style_a=a, b, c…
 Pixels=pixels
 Percent=persent
 PercentOfCell=% van sel
 PercentOfWindow=% van venster
 PercentOfTable=% van tabel
 untitled=titelloos
 ShowToolbar=Vertoon nutsbalk
 HideToolbar=Verskuil nutsbalk
-ImapError=Kon nie prent laai nie
+ImapError=Unable to load image 
 ImapCheck=\nKies asseblief 'n nuwe ligging (URL) en probeer weer.
 SaveToUseRelativeUrl=Relatiewe URL'e kan net gebruik word op bladsye wat gestoor is
 NoNamedAnchorsOrHeadings=(Geen genoemde ankers of koppe in hierdie bladsy nie)
 TextColor=Tekskleur
 HighlightColor=Verligtingskleur
 PageColor=Bladsyagtergrondkleur
 BlockColor=Blokagtergrondkleur
 TableColor=Tabelagtergrondkleur
--- a/editor/ui/chrome/composer/editorOverlay.dtd
+++ b/editor/ui/chrome/composer/editorOverlay.dtd
@@ -48,30 +48,30 @@
 <!ENTITY newBlankPageCmd.label "Composer Page">
 <!ENTITY newBlankPageCmd.accesskey "P">
 <!ENTITY newMenu.label "Nuwe">
 <!ENTITY openFileCmd.label "Open lêer…">
 <!ENTITY openFileCmd.accesskey "O">
 <!ENTITY openFileCmd.key "O">
 <!ENTITY openRemoteCmd.label "Open Web Location…">
 <!ENTITY openRemoteCmd.accesskey "L">
-<!ENTITY openRemoteCmd.key "e">
+<!ENTITY openRemoteCmd.key "L">
 <!ENTITY fileRecentMenu.label "Recent Pages">
 <!ENTITY fileRecentMenu.accesskey "R">
 <!ENTITY fileRevert.label "Revert">
 <!ENTITY fileRevert.accesskey "v">
 <!ENTITY saveCmd.label "Save">
 <!ENTITY saveCmd.accesskey "S">
-<!ENTITY saveCmd.key "n">
+<!ENTITY saveCmd.key "S">
 <!ENTITY saveAsCmd.label "Save As…">
 <!ENTITY saveAsCmd.accesskey "A">
 
 <!ENTITY publishCmd.label "Publish">
 <!ENTITY publishCmd.accesskey "b">
-<!ENTITY publishCmd.key "n">
+<!ENTITY publishCmd.key "S">
 <!ENTITY publishAsCmd.label "Publish As…">
 <!ENTITY publishAsCmd.accesskey "h">
 <!ENTITY exportToTextCmd.label "Export to Text…">
 <!ENTITY exportToTextCmd.accesskey "T">
 <!ENTITY saveAsChangeEncodingCmd.label "Save And Change Character Encoding">
 <!ENTITY saveAsChangeEncodingCmd.accesskey "E">
 <!ENTITY previewCmd.label "Browse Page">
 <!ENTITY previewCmd.accesskey "w">
@@ -114,21 +114,21 @@
 <!ENTITY enableInlineSpellChecker.accesskey "G">
 <!ENTITY checkSpellingCmd2.label "Check Spelling">
 <!ENTITY checkSpellingCmd2.accesskey "h">
 <!ENTITY checkSpellingCmd2.key "p">
 <!ENTITY validateCmd.label "Validate HTML">
 <!ENTITY validateCmd.accesskey "V">
 <!-- Insert menu items -->
 
-<!ENTITY insertMenu.label "Voeg in">
-<!ENTITY insertMenu.accesskey "V">
+<!ENTITY insertMenu.label "Insert">
+<!ENTITY insertMenu.accesskey "I">
 <!ENTITY insertLinkCmd.label "Link…">
 <!ENTITY insertLinkCmd.accesskey "L">
-<!ENTITY insertLinkCmd.key "e">
+<!ENTITY insertLinkCmd.key "L">
 <!ENTITY insertAnchorCmd.label "Named Anchor…">
 <!ENTITY insertAnchorCmd.accesskey "A">
 <!ENTITY insertImageCmd.label "Image…">
 <!ENTITY insertImageCmd.accesskey "I">
 <!ENTITY insertHLineCmd.label "Horizontal Line">
 <!ENTITY insertHLineCmd.accesskey "o">
 <!ENTITY insertTableCmd.label "Table…">
 <!ENTITY insertTableCmd.accesskey "T">
@@ -340,29 +340,29 @@
 <!ENTITY colorsAndBackground.label "Page Colors and Background…">
 <!ENTITY colorsAndBackground.accesskey "u">
 <!-- Table Menu -->
 
 <!ENTITY tableMenu.label "Table">
 <!ENTITY tableMenu.accesskey "b">
 <!-- Select Submenu -->
 
-<!ENTITY tableSelectMenu.label "Merk">
-<!ENTITY tableSelectMenu.accesskey "M">
+<!ENTITY tableSelectMenu.label "Select">
+<!ENTITY tableSelectMenu.accesskey "S">
 
 <!ENTITY tableSelectMenu2.label "Table Select">
 <!ENTITY tableSelectMenu2.accesskey "S">
 <!ENTITY tableInsertMenu2.label "Table Insert">
 <!ENTITY tableInsertMenu2.accesskey "I">
 <!ENTITY tableDeleteMenu2.label "Table Delete">
 <!ENTITY tableDeleteMenu2.accesskey "D">
 <!-- Insert SubMenu -->
 
-<!ENTITY tableInsertMenu.label "Voeg in">
-<!ENTITY tableInsertMenu.accesskey "V">
+<!ENTITY tableInsertMenu.label "Insert">
+<!ENTITY tableInsertMenu.accesskey "I">
 <!ENTITY tableTable.label "Table">
 <!ENTITY tableTable.accesskey "T">
 <!ENTITY tableRow.label "Row">
 <!ENTITY tableRows.label "Ry(e)">
 <!ENTITY tableRow.accesskey "R">
 <!ENTITY tableRowAbove.label "Row Above">
 <!ENTITY tableRowAbove.accesskey "R">
 <!ENTITY tableRowBelow.label "Row Below">
@@ -415,83 +415,83 @@
 <!ENTITY previewToolbarCmd.label "Blaai">
 <!ENTITY previewToolbarCmd.tooltip "Load this page in the browser">
 <!ENTITY printToolbarCmd.label "Druk">
 <!ENTITY printToolbarCmd.tooltip "Druk hierdie bladsy">
 <!ENTITY findToolbarCmd.label "Vind">
 <!ENTITY findToolbarCmd.tooltip "Vind teks in bladsy">
 <!ENTITY spellToolbarCmd.label "Spel">
 <!ENTITY spellToolbarCmd.tooltip "Toets spelling van gemerkte teks of hele bladsy">
-<!ENTITY imageToolbarCmd.label "Prent">
+<!ENTITY imageToolbarCmd.label "Image">
 <!ENTITY imageToolbarCmd.tooltip "Voeg nuwe prent in of redigeer gemerkte prent se eienskappe">
 <!ENTITY hruleToolbarCmd.label "H.streep">
 <!ENTITY hruleToolbarCmd.tooltip "Voeg horisontale streep in of redigeer gemerkte streep se eienskappe">
-<!ENTITY tableToolbarCmd.label "Tabel">
+<!ENTITY tableToolbarCmd.label "Table">
 <!ENTITY tableToolbarCmd.tooltip "Voeg nuwe tabel in of redigeer gemerkte tabel se eienskappe">
-<!ENTITY linkToolbarCmd.label "Skakel">
+<!ENTITY linkToolbarCmd.label "Link">
 <!ENTITY linkToolbarCmd.tooltip "Voeg nuwe skakel in of redigeer gemerkte skakel se eienskappe">
 <!ENTITY anchorToolbarCmd.label "Anker">
 <!ENTITY anchorToolbarCmd.tooltip "Voeg nuwe genoemde anker in of redigeer gemerkte anker se eienskappe">
 <!ENTITY TextColorButton.tooltip "Kies kleur vir teks">
 <!ENTITY BackgroundColorButton.tooltip "Kies kleur vir agtergrond">
 <!ENTITY throbber.tooltip "Gaan na &vendorShortName; se tuisblad">
 <!ENTITY HighlightColorButton.tooltip "Kies verligkleur vir teks">
 <!-- Editor toolbar -->
 
 <!ENTITY decreaseFontSizeToolbarCmd.tooltip "Kleiner lettertipe">
 <!ENTITY increaseFontSizeToolbarCmd.tooltip "Groter lettertipe">
-<!ENTITY boldToolbarCmd.tooltip "Vet">
-<!ENTITY italicToolbarCmd.tooltip "Skuins">
-<!ENTITY underlineToolbarCmd.tooltip "Onderstreep">
+<!ENTITY boldToolbarCmd.tooltip "Bold">
+<!ENTITY italicToolbarCmd.tooltip "Italic">
+<!ENTITY underlineToolbarCmd.tooltip "Underline">
 <!ENTITY bulletListToolbarCmd.tooltip "Verwyder of voeg kollys by">
 <!ENTITY numberListToolbarCmd.tooltip "Verwyder of voeg nommerlys by">
 <!ENTITY outdentToolbarCmd.tooltip "Keep teks uit (skuif links)">
 <!ENTITY indentToolbarCmd.tooltip "Keep teks in (skuif regs)">
 <!ENTITY AlignPopupButton.tooltip "Kies teksgerigtheid">
 <!ENTITY InsertPopupButton.tooltip "Voeg 'n skakel, anker, prent, horisontale streep of tabel in">
 <!ENTITY alignLeftButton.tooltip "Rig teks langs linkerkantlyn langs">
 <!ENTITY alignCenterButton.tooltip "Rig teks middelhaaks">
 <!ENTITY alignRightButton.tooltip "Rig teks langs regterkantlyn langs">
 <!ENTITY alignjustifyButton.tooltip "Rig teks langs linker- en regterkantlyn langs">
 <!-- Display Mode toolbar and View menu items -->
 
 <!ENTITY NormalModeTab.label "Gewoon">
 <!ENTITY NormalMode.label "Gewoneredigeer-modus">
-<!ENTITY NormalMode.accesskey "g">
+<!ENTITY NormalMode.accesskey "G">
 <!ENTITY NormalMode.tooltip "Wys tabelrande en genoemde ankers">
 <!ENTITY AllTagsMode.label "HTML-merkers">
-<!ENTITY AllTagsMode.accesskey "E">
+<!ENTITY AllTagsMode.accesskey "e">
 <!ENTITY AllTagsMode.tooltip "Vertoon ikone vir alle HTML-merkers">
 
 <!ENTITY HTMLSourceMode.label "HTML-bron">
 <!-- Toolbar has an image with "HTML" text, so don't include it in the string -->
 <!ENTITY SourceMode.label "Bron">
-<!ENTITY HTMLSourceMode.accesskey "h">
+<!ENTITY HTMLSourceMode.accesskey "H">
 <!ENTITY HTMLSourceMode.tooltip "Redigeer HTML-bron">
 <!ENTITY PreviewMode.label "Voorskou">
-<!ENTITY PreviewMode.accesskey "v">
+<!ENTITY PreviewMode.accesskey "V">
 <!ENTITY PreviewMode.tooltip "Display as WYSIWYG (as in the browser)">
 <!-- LOCALIZATION NOTE: Do NOT translate text for 'SourceTabDirection'
      Use latin "ltr" if you want the <html> image to left of the 
      'SourceMode.label' text defined above,
      or use latin "rtl" if you want this image to the right of text
      This is the value of the HTML 'dir' attribute
 -->
 
 <!ENTITY SourceTabDirection "ltr">
 <!-- Structure Toolbar Context Menu items -->
 
-<!ENTITY structSelect.label "Merk">
-<!ENTITY structSelect.accesskey "m">
+<!ENTITY structSelect.label "Select">
+<!ENTITY structSelect.accesskey "s">
 <!ENTITY structRemoveTag.label "Verwyder merker">
-<!ENTITY structRemoveTag.accesskey "v">
+<!ENTITY structRemoveTag.accesskey "V">
 <!ENTITY structChangeTag.label "Wysig merker">
-<!ENTITY structChangeTag.accesskey "w">
+<!ENTITY structChangeTag.accesskey "W">
 <!-- TOC manipulation -->
 
-<!ENTITY insertTOC.label "Voeg in">
-<!ENTITY insertTOC.accesskey "v">
+<!ENTITY insertTOC.label "Insert">
+<!ENTITY insertTOC.accesskey "i">
 <!ENTITY updateTOC.label "Werk by">
-<!ENTITY updateTOC.accesskey "w">
+<!ENTITY updateTOC.accesskey "W">
 <!ENTITY removeTOC.label "Verwyder">
-<!ENTITY removeTOC.accesskey "v">
+<!ENTITY removeTOC.accesskey "V">
 <!ENTITY tocMenu.label "Table of Contents…">
 <!ENTITY tocMenu.accesskey "b">
--- a/editor/ui/chrome/composer/pref-editing.dtd
+++ b/editor/ui/chrome/composer/pref-editing.dtd
@@ -9,19 +9,19 @@
 <!ENTITY customColors.label "Use custom colors:">
 <!ENTITY customColors.accesskey "c">
 
 <!ENTITY normalText.label "Gewone teks">
 <!ENTITY normalText.accesskey "G">
 <!ENTITY linkText.label "Skakelteks">
 <!ENTITY linkText.accesskey "S">
 <!ENTITY activeLinkText.label "Teks van aktiewe skakels">
-<!ENTITY activeLinkText.accesskey "A">
+<!ENTITY activeLinkText.accesskey "a">
 <!ENTITY visitedLinkText.label "Teks van besoekte skakels">
-<!ENTITY visitedLinkText.accesskey "B">
+<!ENTITY visitedLinkText.accesskey "b">
 <!ENTITY background.label "Agtergrond:">
 <!ENTITY background.accesskey "A">
 <!ENTITY colon.character ":">
 
 <!ENTITY backgroundImage.label "Agtergrondprent:">
 <!ENTITY backgroundImage.accesskey "p">
 <!ENTITY chooseFile.label "Choose File…">
 <!ENTITY chooseFile.accesskey "o">
--- a/editor/ui/chrome/dialogs/EdDialogOverlay.dtd
+++ b/editor/ui/chrome/dialogs/EdDialogOverlay.dtd
@@ -38,14 +38,14 @@
 <!ENTITY AdvancedEditButton.label "Advanced Edit…">
 <!ENTITY AdvancedEditButton.accessKey "E">
 <!ENTITY AdvancedEditButton.tooltip "Wysig of voeg HTML-attribute, styl-attribute en JavaScript by">
 <!ENTITY chooseFileButton.label "Choose File...">
 <!ENTITY chooseFileButton.accessKey "F">
 <!ENTITY chooseFileLinkButton.label "Choose File...">
 <!ENTITY chooseFileLinkButton.accessKey "o">
 <!ENTITY makeUrlRelative.label "URL is relatief tot bladsyligging">
-<!ENTITY makeUrlRelative.accessKey "r">
+<!ENTITY makeUrlRelative.accessKey "R">
 <!ENTITY makeUrlRelative.tooltip "Verander tussen relatiewe en absolute URL. U moet eers die bladsy stoor voor u dit verander.">
 <!-- Shared by Link and Image dialogs -->
 
 <!ENTITY LinkURLEditField.label "Tik 'n webbladsy se ligging of 'n plaaslike lêer in, of kies 'n genoemde anker of kop uit die opspringlys:">
-<!ENTITY LinkURLEditField.accessKey "L">
+<!ENTITY LinkURLEditField.accessKey "l">
--- a/editor/ui/chrome/dialogs/EdNamedAnchorProperties.dtd
+++ b/editor/ui/chrome/dialogs/EdNamedAnchorProperties.dtd
@@ -32,11 +32,11 @@
    - 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 windowTitle.label "Genoemdeanker-eienskappe">
 <!ENTITY anchorNameEditField.label "Ankernaam:">
-<!ENTITY anchorNameEditField.accessKey "N">
+<!ENTITY anchorNameEditField.accessKey "n">
 <!ENTITY nameInput.tooltip "Tik 'n unieke naam vir hierdie genoemde anker in (teiken)">
 
--- a/editor/ui/chrome/dialogs/EditorButtonProperties.dtd
+++ b/editor/ui/chrome/dialogs/EditorButtonProperties.dtd
@@ -44,16 +44,16 @@
 <!ENTITY reset.value "Teruglaai">
 <!ENTITY button.value "Knoppie">
 
 <!ENTITY ButtonName.label "Naam:">
 <!ENTITY ButtonName.accesskey "N">
 <!ENTITY ButtonValue.label "Waarde:">
 <!ENTITY ButtonValue.accesskey "W">
 <!ENTITY tabIndex.label "Oortjie-indeks:">
-<!ENTITY tabIndex.accesskey "I">
+<!ENTITY tabIndex.accesskey "i">
 <!ENTITY ButtonDisabled.label "Gedeaktiveer">
 <!ENTITY ButtonDisabled.accesskey "G">
 <!ENTITY AccessKey.label "Toegangsleutel:">
-<!ENTITY AccessKey.accesskey "S">
+<!ENTITY AccessKey.accesskey "s">
 
 <!ENTITY RemoveButton.label "Verwyder knoppie">
 <!ENTITY RemoveButton.accesskey "V">
--- a/editor/ui/chrome/dialogs/EditorColorProperties.dtd
+++ b/editor/ui/chrome/dialogs/EditorColorProperties.dtd
@@ -34,28 +34,28 @@
    - the terms of any one of the MPL, the GPL or the LGPL.
    -
    - ***** END LICENSE BLOCK ***** -->
 <!-- Window title -->
 
 <!ENTITY windowTitle.label "Bladsykleure en -agtergrond">
 <!ENTITY pageColors.label "Bladsykleure">
 <!ENTITY defaultColorsRadio.label "Leser se verstek-kleure (moenie kleure in die bladsy opstel nie)">
-<!ENTITY defaultColorsRadio.accessKey "M">
+<!ENTITY defaultColorsRadio.accessKey "m">
 <!ENTITY defaultColorsRadio.tooltip "Gebruik slegs die kleuropstelling uit die leser se blaaier">
 <!ENTITY customColorsRadio.label "Gebruik pasgemaakte kleure:">
-<!ENTITY customColorsRadio.accessKey "P">
+<!ENTITY customColorsRadio.accessKey "p">
 <!ENTITY customColorsRadio.tooltip "Hierdie kleuropstelling oorheers die leser se blaaieropstelling">
 
 <!ENTITY normalText.label "Gewone teks">
 <!ENTITY normalText.accessKey "G">
 <!ENTITY linkText.label "Skakelteks">
 <!ENTITY linkText.accessKey "S">
 <!ENTITY activeLinkText.label "Teks van aktiewe skakels">
-<!ENTITY activeLinkText.accessKey "A">
+<!ENTITY activeLinkText.accessKey "a">
 <!ENTITY visitedLinkText.label "Teks van besoekte skakels">
-<!ENTITY visitedLinkText.accessKey "B">
+<!ENTITY visitedLinkText.accessKey "b">
 <!ENTITY background.label "Agtergrond:">
 <!ENTITY background.accessKey "A">
 <!ENTITY colon.character ":">
 <!ENTITY backgroundImage.label "Agtergrondprent:">
 <!ENTITY backgroundImage.accessKey "p">
 <!ENTITY backgroundImage.tooltip "Gebruik 'n prentlêer as die agtergrond van u bladsy">
--- a/editor/ui/chrome/dialogs/EditorFieldSetProperties.dtd
+++ b/editor/ui/chrome/dialogs/EditorFieldSetProperties.dtd
@@ -35,17 +35,17 @@
    - ***** END LICENSE BLOCK ***** -->
 
 <!ENTITY windowTitle.label "Veldstel-eienskappe">
 
 <!ENTITY Legend.label "Legende">
 <!ENTITY Legend.accesskey "L">
 
 <!ENTITY EditLegendText.label "Redigeer legende:">
-<!ENTITY EditLegendText.accesskey "E">
+<!ENTITY EditLegendText.accesskey "e">
 <!ENTITY LegendAlign.label "Rig legende:">
 <!ENTITY LegendAlign.accesskey "R">
 <!ENTITY AlignDefault.label "Verstek">
 <!ENTITY AlignLeft.label "Links">
 <!ENTITY AlignCenter.label "Sentreer">
 <!ENTITY AlignRight.label "Regs">
 
 <!ENTITY RemoveFieldSet.label "Verwyder veldstel">
--- a/editor/ui/chrome/dialogs/EditorFormProperties.dtd
+++ b/editor/ui/chrome/dialogs/EditorFormProperties.dtd
@@ -34,17 +34,17 @@
    -
    - ***** END LICENSE BLOCK ***** -->
 
 <!ENTITY windowTitle.label "Vormeienskappe">
 
 <!ENTITY Settings.label "Opstelling">
 
 <!ENTITY FormName.label "Vormnaam:">
-<!ENTITY FormName.accesskey "N">
+<!ENTITY FormName.accesskey "n">
 <!ENTITY FormAction.label "Aksie-URL:">
 <!ENTITY FormAction.accesskey "A">
 <!ENTITY FormMethod.label "Metode:">
 <!ENTITY FormMethod.accesskey "M">
 <!ENTITY FormEncType.label "Enkodering:">
 <!ENTITY FormEncType.accesskey "k">
 <!ENTITY FormTarget.label "Doelraam:">
 <!ENTITY FormTarget.accesskey "D">
--- a/editor/ui/chrome/dialogs/EditorHLineProperties.dtd
+++ b/editor/ui/chrome/dialogs/EditorHLineProperties.dtd
@@ -36,25 +36,25 @@
    - ***** END LICENSE BLOCK ***** -->
 <!-- Window title -->
 
 
 <!ENTITY windowTitle.label "Eienskappe van horisontale strepe">
 
 <!ENTITY dimensionsBox.label "Dimensies">
 <!ENTITY heightEditField.label "Hoogte:">
-<!ENTITY heightEditField.accessKey "G">
+<!ENTITY heightEditField.accessKey "g">
 <!ENTITY widthEditField.label "Wydte:">
 <!ENTITY widthEditField.accessKey "W">
 <!ENTITY pixelsPopup.value "pixels">
 <!ENTITY alignmentBox.label "Gerigtheid">
 <!ENTITY leftRadio.label "Left">
 <!ENTITY leftRadio.accessKey "L">
 <!ENTITY centerRadio.label "Center">
 <!ENTITY centerRadio.accessKey "C">
 <!ENTITY rightRadio.label "Right">
 <!ENTITY rightRadio.accessKey "R">
 
 <!ENTITY threeDShading.label "3-D skaduwees">
-<!ENTITY threeDShading.accessKey "S">
+<!ENTITY threeDShading.accessKey "s">
 <!ENTITY saveSettings.label "Gebruik as verstek">
-<!ENTITY saveSettings.accessKey "V">
+<!ENTITY saveSettings.accessKey "v">
 <!ENTITY saveSettings.tooltip "Stoor dié opstelling vir die invoeg van nuwe horisontale strepe">
--- a/editor/ui/chrome/dialogs/EditorImageProperties.dtd
+++ b/editor/ui/chrome/dialogs/EditorImageProperties.dtd
@@ -39,17 +39,17 @@
 
 
 <!ENTITY windowTitle.label "Prenteienskappe">
 
 <!ENTITY pixelsPopup.value "pixels">
 <!-- These are in the Location tab panel -->
 
 <!ENTITY locationEditField.label "Prentligging:">
-<!ENTITY locationEditField.accessKey "L">
+<!ENTITY locationEditField.accessKey "l">
 <!ENTITY locationEditField.tooltip "Tik die prent se lêernaam of ligging in">
 <!ENTITY title.label "Nutswenk:">
 <!ENTITY title.accessKey "N">
 <!ENTITY title.tooltip 'Die HTML-"title"-attribuut wat as opwipwenk vertoon'>
 <!ENTITY altText.label "Alt-teks:">
 <!ENTITY altText.accessKey "A">
 <!ENTITY altTextEditField.tooltip "Tik teks in wat in die plek van die prent vertoon moet word">
 <!ENTITY noAltText.label "Moenie Alt-teks gebruik nie">
@@ -59,20 +59,20 @@
 <!-- These controls are in the Dimensions tab panel -->
 <!-- actualSize.label should be same as actualSizeRadio.label + ":" -->
 
 <!ENTITY actualSize.label "Werklike grootte:">
 <!ENTITY actualSizeRadio.label "Werklike grootte">
 <!ENTITY actualSizeRadio.accessKey "W">
 <!ENTITY actualSizeRadio.tooltip "Keer terug na prent se werklike grootte">
 <!ENTITY customSizeRadio.label "Gepasmaakte grootte">
-<!ENTITY customSizeRadio.accessKey "G">
+<!ENTITY customSizeRadio.accessKey "g">
 <!ENTITY customSizeRadio.tooltip "Wysig die prent se grootte soos vertoon op die bladsy">
 <!ENTITY heightEditField.label "Hoogte:">
-<!ENTITY heightEditField.accessKey "G">
+<!ENTITY heightEditField.accessKey "g">
 <!ENTITY widthEditField.label "Wydte:">
 <!ENTITY widthEditField.accessKey "W">
 <!ENTITY constrainCheckbox.label "Beperk">
 <!ENTITY constrainCheckbox.accessKey "B">
 <!ENTITY constrainCheckbox.tooltip "Behou die prent se aspekverhouding">
 <!-- These controls are in the Image Map box of the expanded area -->
 
 <!ENTITY imagemapBox.label "Prentkaart">
@@ -91,20 +91,20 @@
 <!-- These controls are in the Spacing Box -->
 
 <!ENTITY spacingBox.label "Spasiëring">
 <!ENTITY leftRightEditField.label "Links en regs:">
 <!ENTITY leftRightEditField.accessKey "L">
 <!ENTITY topBottomEditField.label "Bo- en onderkant:">
 <!ENTITY topBottomEditField.accessKey "B">
 <!ENTITY borderEditField.label "Soliede rand:">
-<!ENTITY borderEditField.accessKey "R">
+<!ENTITY borderEditField.accessKey "r">
 <!-- These controls are in the Link Box -->
 
 <!ENTITY showImageLinkBorder.label "Wys rand rondom geskakelde prent">
-<!ENTITY showImageLinkBorder.accessKey "R">
+<!ENTITY showImageLinkBorder.accessKey "r">
 <!-- These tabs are currently used in the image input dialog -->
 
 <!ENTITY imageInputTab.label "Vorm">
 <!ENTITY imageLocationTab.label "Ligging">
 <!ENTITY imageDimensionsTab.label "Dimensies">
 <!ENTITY imageAppearanceTab.label "Voorkoms">
 <!ENTITY imageLinkTab.label "Skakel">
--- a/editor/ui/chrome/dialogs/EditorInputProperties.dtd
+++ b/editor/ui/chrome/dialogs/EditorInputProperties.dtd
@@ -33,17 +33,17 @@
    - the terms of any one of the MPL, the GPL or the LGPL.
    -
    - ***** END LICENSE BLOCK ***** -->
 
 <!ENTITY windowTitle.label "Vormveld-eienskappe">
 <!ENTITY windowTitleImage.label "Vormprent-eienskappe">
 
 <!ENTITY InputType.label "Veldsoort">
-<!ENTITY InputType.accesskey "S">
+<!ENTITY InputType.accesskey "s">
 <!ENTITY text.value "Teks">
 <!ENTITY password.value "Wagwoord">
 <!ENTITY checkbox.value "Merkkassie">
 <!ENTITY radio.value "Klinkknoppie">
 <!ENTITY submit.value "Indien-knoppie">
 <!ENTITY reset.value "Teruglaai-knoppie">
 <!ENTITY file.value "Lêer">
 <!ENTITY hidden.value "Verskuil">
@@ -55,28 +55,28 @@
 <!ENTITY InputName.accesskey "N">
 <!ENTITY GroupName.label "Group Name:">
 <!ENTITY GroupName.accesskey "N">
 <!ENTITY InputValue.label "Field Value:">
 <!ENTITY InputValue.accesskey "V">
 <!ENTITY InitialValue.label "Initial Value:">
 <!ENTITY InitialValue.accesskey "V">
 <!ENTITY InputChecked.label "Aanvanklik gemerk">
-<!ENTITY InputChecked.accesskey "G">
+<!ENTITY InputChecked.accesskey "g">
 <!ENTITY InputSelected.label "Aanvanklik gekies">
-<!ENTITY InputSelected.accesskey "G">
+<!ENTITY InputSelected.accesskey "g">
 <!ENTITY InputReadOnly.label "Leesalleen">
 <!ENTITY InputReadOnly.accesskey "L">
 <!ENTITY InputDisabled.label "Gedeaktiveer">
 <!ENTITY InputDisabled.accesskey "G">
 <!ENTITY tabIndex.label "Oortjie-indeks:">
-<!ENTITY tabIndex.accesskey "I">
+<!ENTITY tabIndex.accesskey "i">
 <!ENTITY TextSize.label "Veldgrootte:">
 <!ENTITY TextSize.accesskey "V">
 <!ENTITY TextLength.label "Maksimum lengte:">
-<!ENTITY TextLength.accesskey "L">
+<!ENTITY TextLength.accesskey "l">
 <!ENTITY AccessKey.label "Toegangsleutel:">
-<!ENTITY AccessKey.accesskey "S">
+<!ENTITY AccessKey.accesskey "s">
 <!ENTITY Accept.label "Aanvaar soorte:">
 <!ENTITY Accept.accesskey "A">
 
 <!ENTITY ImageProperties.label "Image Properties…">
 <!ENTITY ImageProperties.accesskey "E">
--- a/editor/ui/chrome/dialogs/EditorLabelProperties.dtd
+++ b/editor/ui/chrome/dialogs/EditorLabelProperties.dtd
@@ -35,16 +35,16 @@
    - ***** END LICENSE BLOCK ***** -->
 
 <!ENTITY windowTitle.label "Etiket-eienskappe">
 
 <!ENTITY Settings.label "Opstelling">
 <!ENTITY Settings.accesskey "O">
 
 <!ENTITY EditLabelText.label "Redigeer teks:">
-<!ENTITY EditLabelText.accesskey "T">
+<!ENTITY EditLabelText.accesskey "t">
 <!ENTITY LabelFor.label "Vir kontrole:">
 <!ENTITY LabelFor.accesskey "V">
 <!ENTITY AccessKey.label "Toegangsleutel:">
-<!ENTITY AccessKey.accesskey "S">
+<!ENTITY AccessKey.accesskey "s">
 
 <!ENTITY RemoveLabel.label "Verwyder etiket">
 <!ENTITY RemoveLabel.accesskey "V">
--- a/editor/ui/chrome/dialogs/EditorListProperties.dtd
+++ b/editor/ui/chrome/dialogs/EditorListProperties.dtd
@@ -45,9 +45,9 @@
 <!ENTITY startingNumber.accessKey "B">
 <!ENTITY none.value "Geen">
 <!ENTITY bulletList.value "Koeëltjielys (nommerloos)">
 <!ENTITY numberList.value "Genommerde lys">
 <!ENTITY definitionList.value "Definisielys">
 <!ENTITY changeEntireListRadio.label "Verander hele lys">
 <!ENTITY changeEntireListRadio.accessKey "V">
 <!ENTITY changeSelectedRadio.label "Verander slegs gemerkte items">
-<!ENTITY changeSelectedRadio.accessKey "I">
+<!ENTITY changeSelectedRadio.accessKey "i">
--- a/editor/ui/chrome/dialogs/EditorReplace.dtd
+++ b/editor/ui/chrome/dialogs/EditorReplace.dtd
@@ -51,10 +51,10 @@
 <!ENTITY backwardsCheckbox.accesskey "t">
 <!ENTITY findNextButton.label "Vind volgende">
 <!ENTITY findNextButton.accesskey "V">
 <!ENTITY replaceButton.label "Vervang">
 <!ENTITY replaceButton.accesskey "V">
 <!ENTITY replaceAndFindButton.label "Vervang en vind">
 <!ENTITY replaceAndFindButton.accesskey "n">
 <!ENTITY replaceAllButton.label "Vervang alles">
-<!ENTITY replaceAllButton.accesskey "A">
+<!ENTITY replaceAllButton.accesskey "a">
 <!ENTITY closeButton.label "Sluit">
--- a/editor/ui/chrome/dialogs/EditorSelectProperties.dtd
+++ b/editor/ui/chrome/dialogs/EditorSelectProperties.dtd
@@ -33,48 +33,48 @@
    - the terms of any one of the MPL, the GPL or the LGPL.
    -
    - ***** END LICENSE BLOCK ***** -->
 
 <!ENTITY windowTitle.label "Seleksielys-eienskappe">
 
 <!ENTITY Select.label "Seleksielys">
 <!ENTITY SelectName.label "Lysnaam:">
-<!ENTITY SelectName.accesskey "N">
+<!ENTITY SelectName.accesskey "n">
 <!ENTITY SelectSize.label "Hoogte:">
 <!ENTITY SelectSize.accesskey "H">
 <!ENTITY SelectMultiple.label "Meervoudige seleksie">
 <!ENTITY SelectMultiple.accesskey "M">
 <!ENTITY SelectDisabled.label "Gedeaktiveer">
 <!ENTITY SelectDisabled.accesskey "G">
 <!ENTITY SelectTabIndex.label "Oortjie-indeks:">
-<!ENTITY SelectTabIndex.accesskey "I">
+<!ENTITY SelectTabIndex.accesskey "i">
 
 <!ENTITY OptGroup.label "Opsiegroep">
 <!ENTITY OptGroupLabel.label "Etiket:">
 <!ENTITY OptGroupLabel.accesskey "E">
 <!ENTITY OptGroupDisabled.label "Gedeaktiveer">
 <!ENTITY OptGroupDisabled.accesskey "G">
 
 <!ENTITY Option.label "Opsie">
 <!ENTITY OptionText.label "Teks:">
 <!ENTITY OptionText.accesskey "T">
 <!ENTITY OptionValue.label "Waarde:">
 <!ENTITY OptionValue.accesskey "W">
 <!ENTITY OptionSelected.label "Aanvanklik gekies">
-<!ENTITY OptionSelected.accesskey "G">
+<!ENTITY OptionSelected.accesskey "g">
 <!ENTITY OptionDisabled.label "Gedeaktiveer">
 <!ENTITY OptionDisabled.accesskey "G">
 
 <!ENTITY TextHeader.label "Teks">
 <!ENTITY ValueHeader.label "Waarde">
 <!ENTITY SelectedHeader.label "Gekies">
 
 <!ENTITY AddOption.label "Voeg opsie by">
-<!ENTITY AddOption.accesskey "O">
+<!ENTITY AddOption.accesskey "o">
 <!ENTITY AddOptGroup.label "Voeg groep by">
-<!ENTITY AddOptGroup.accesskey "G">
+<!ENTITY AddOptGroup.accesskey "g">
 <!ENTITY RemoveElement.label "Verwyder">
 <!ENTITY RemoveElement.accesskey "V">
 <!ENTITY MoveElementUp.label "Skuif op">
-<!ENTITY MoveElementUp.accesskey "O">
+<!ENTITY MoveElementUp.accesskey "o">
 <!ENTITY MoveElementDown.label "Skuif af">
-<!ENTITY MoveElementDown.accesskey "A">
+<!ENTITY MoveElementDown.accesskey "a">
--- a/editor/ui/chrome/dialogs/EditorSpellCheck.dtd
+++ b/editor/ui/chrome/dialogs/EditorSpellCheck.dtd
@@ -47,25 +47,25 @@
 <!ENTITY suggestions.accessKey "o">
 <!ENTITY ignoreButton.label "Ignoreer">
 <!ENTITY ignoreButton.accessKey "I">
 <!ENTITY ignoreAllButton.label "Ignoreer alles">
 <!ENTITY ignoreAllButton.accessKey "n">
 <!ENTITY replaceButton.label "Vervang">
 <!ENTITY replaceButton.accessKey "V">
 <!ENTITY replaceAllButton.label "Vervang alles">
-<!ENTITY replaceAllButton.accessKey "A">
+<!ENTITY replaceAllButton.accessKey "a">
 <!ENTITY stopButton.label "Stop">
 <!ENTITY stopButton.accessKey "t">
 <!ENTITY userDictionary.label "Persoonlike subgids:">
 <!ENTITY moreDictionaries.label "Download more dictionaries…">
 <!ENTITY addToUserDictionaryButton.label "Voeg woord by">
 <!ENTITY addToUserDictionaryButton.accessKey "o">
 <!ENTITY editUserDictionaryButton.label "Redigeer…">
 <!ENTITY editUserDictionaryButton.accessKey "R">
 <!ENTITY recheckButton.label "Gaan bladsy weer na">
-<!ENTITY recheckButton.accessKey "B">
+<!ENTITY recheckButton.accessKey "b">
 <!ENTITY closeButton.label "Sluit">
 <!ENTITY closeButton.accessKey "S">
 <!ENTITY sendButton.label "Stuur">
 <!ENTITY sendButton.accessKey "S">
 <!ENTITY languagePopup.label "Taal:">
 <!ENTITY languagePopup.accessKey "T">
--- a/editor/ui/chrome/dialogs/EditorTableProperties.dtd
+++ b/editor/ui/chrome/dialogs/EditorTableProperties.dtd
@@ -41,51 +41,51 @@
 <!ENTITY closeButton.label "Sluit">
 <!ENTITY tableTab.label "Tabel">
 <!ENTITY cellTab.label "Selle">
 <!ENTITY tableRows.label "Rye:">
 <!ENTITY tableRows.accessKey "R">
 <!ENTITY tableColumns.label "Kolomme:">
 <!ENTITY tableColumns.accessKey "K">
 <!ENTITY tableHeight.label "Hoogte:">
-<!ENTITY tableHeight.accessKey "G">
+<!ENTITY tableHeight.accessKey "g">
 <!ENTITY tableWidth.label "Wydte:">
 <!ENTITY tableWidth.accessKey "W">
 <!ENTITY tableBorderSpacing.label "Randte en spasiëring">
 <!ENTITY tableBorderWidth.label "Rand:">
 <!ENTITY tableBorderWidth.accessKey "R">
 <!ENTITY tableSpacing.label "Spasiëring:">
 <!ENTITY tableSpacing.accessKey "S">
 <!ENTITY tablePadding.label "Opvulling:">
 <!ENTITY tablePadding.accessKey "O">
 <!ENTITY tablePxBetwCells.label "pixels tussen selle">
 <!ENTITY tablePxBetwBrdrCellContent.label "pixels tussen selrand en -inhoud">
 <!ENTITY tableAlignment.label "Tabelbelyning:">
 <!ENTITY tableAlignment.accessKey "T">
 <!ENTITY tableCaption.label "Byskrif:">
-<!ENTITY tableCaption.accessKey "F">
+<!ENTITY tableCaption.accessKey "f">
 <!ENTITY tableCaptionAbove.label "Bokant tabel">
 <!ENTITY tableCaptionBelow.label "Onderkant tabel">
 <!ENTITY tableCaptionLeft.label "Links van tabel">
 <!ENTITY tableCaptionRight.label "Regs van tabel">
 <!ENTITY tableCaptionNone.label "Geen">
 <!ENTITY tableInheritColor.label "(Laat bladsykleur deurskyn)">
 
 <!ENTITY cellSelection.label "Seleksie">
 <!ENTITY cellSelectCell.label "Sel">
 <!ENTITY cellSelectRow.label "Ry">
 <!ENTITY cellSelectColumn.label "Kolom">
 <!ENTITY cellSelectNext.label "Volgende">
-<!ENTITY cellSelectNext.accessKey "N">
+<!ENTITY cellSelectNext.accessKey "n">
 <!ENTITY cellSelectPrevious.label "Vorige">
 <!ENTITY cellSelectPrevious.accessKey "V">
 <!ENTITY applyBeforeChange.label "Current changes will be applied before changing the selection.">
 <!ENTITY cellContentAlignment.label "Inhoudgerigtheid">
 <!ENTITY cellHorizontal.label "Horisontaal:">
-<!ENTITY cellHorizontal.accessKey "S">
+<!ENTITY cellHorizontal.accessKey "s">
 <!ENTITY cellVertical.label "Vertikaal:">
 <!ENTITY cellVertical.accessKey "V">
 <!ENTITY cellStyle.label "Selstyl:">
 <!ENTITY cellStyle.accessKey "S">
 <!ENTITY cellNormal.label "Gewoon">
 <!ENTITY cellHeader.label "Kop">
 <!ENTITY cellTextWrap.label "Teksomvou:">
 <!ENTITY cellTextWrap.accessKey "T">
--- a/editor/ui/chrome/dialogs/EditorTextAreaProperties.dtd
+++ b/editor/ui/chrome/dialogs/EditorTextAreaProperties.dtd
@@ -34,31 +34,31 @@
    -
    - ***** END LICENSE BLOCK ***** -->
 
 <!ENTITY windowTitle.label "Teksarea-eienskappe">
 
 <!ENTITY Settings.label "Opstelling">
 
 <!ENTITY TextAreaName.label "Veldnaam:">
-<!ENTITY TextAreaName.accessKey "N">
+<!ENTITY TextAreaName.accessKey "n">
 <!ENTITY TextAreaRows.label "Rye:">
 <!ENTITY TextAreaRows.accessKey "R">
 <!ENTITY TextAreaCols.label "Kolomme:">
 <!ENTITY TextAreaCols.accessKey "K">
 <!ENTITY TextAreaReadOnly.label "Leesalleen">
-<!ENTITY TextAreaReadOnly.accessKey "A">
+<!ENTITY TextAreaReadOnly.accessKey "a">
 <!ENTITY TextAreaDisabled.label "Gedeaktiveer">
 <!ENTITY TextAreaDisabled.accessKey "G">
 <!ENTITY TextAreaTabIndex.label "Oortjie-indeks:">
-<!ENTITY TextAreaTabIndex.accessKey "I">
+<!ENTITY TextAreaTabIndex.accessKey "i">
 <!ENTITY TextAreaAccessKey.label "Toegangsleutel:">
-<!ENTITY TextAreaAccessKey.accessKey "S">
+<!ENTITY TextAreaAccessKey.accessKey "s">
 <!ENTITY InitialText.label "Aanvanklike teks:">
-<!ENTITY InitialText.accessKey "T">
+<!ENTITY InitialText.accessKey "t">
 
 <!ENTITY TextAreaWrap.label "Omvou-modus:">
 <!ENTITY TextAreaWrap.accessKey "O">
 <!ENTITY WrapDefault.value "Verstek">
 <!ENTITY WrapOff.value "Af">
 <!ENTITY WrapHard.value "Hard">
 <!ENTITY WrapSoft.value "Sag">
 <!ENTITY WrapPhysical.value "Fisies">
--- a/mail/chrome/communicator/utilityOverlay.dtd
+++ b/mail/chrome/communicator/utilityOverlay.dtd
@@ -1,59 +1,59 @@
 <!-- these things need to move into utilityOverlay.xul -->
 <!-- LOCALIZATION NOTE : FILE This file contains the global menu items -->
 
 
 <!ENTITY fileMenu.label "Lêer">
-<!ENTITY fileMenu.accesskey "l">
+<!ENTITY fileMenu.accesskey "L">
 <!ENTITY newMenu.label "Nuwe">
 <!ENTITY newMenu.accesskey "N">
 
 <!ENTITY editMenu.label "Redigeer">
-<!ENTITY editMenu.accesskey "r">
+<!ENTITY editMenu.accesskey "R">
 <!ENTITY undoCmd.label "Ontdoen">
 <!ENTITY undoCmd.key "Z">
-<!ENTITY undoCmd.accesskey "o">
+<!ENTITY undoCmd.accesskey "O">
 <!ENTITY redoCmd.label "Herdoen">
 <!ENTITY redoCmd.key "Y">
-<!ENTITY redoCmd.accesskey "h">
+<!ENTITY redoCmd.accesskey "H">
 <!ENTITY cutCmd.label "Knip">
 <!ENTITY cutCmd.key "X">
 <!ENTITY cutCmd.accesskey "p">
 <!ENTITY copyCmd.label "Kopieer">
 <!ENTITY copyCmd.key "C">
-<!ENTITY copyCmd.accesskey "k">
+<!ENTITY copyCmd.accesskey "K">
 <!ENTITY pasteCmd.label "Plak">
 <!ENTITY pasteCmd.key "V">
-<!ENTITY pasteCmd.accesskey "p">
+<!ENTITY pasteCmd.accesskey "P">
 <!ENTITY deleteCmd.label "Skrap">
-<!ENTITY deleteCmd.accesskey "s">
+<!ENTITY deleteCmd.accesskey "S">
 <!ENTITY selectAllCmd.label "Merk alles">
 <!ENTITY selectAllCmd.key "A">
 <!ENTITY selectAllCmd.accesskey "a">
 <!ENTITY preferencesCmd.label "Opsies…">
 <!ENTITY preferencesCmd.accesskey "O">
 <!ENTITY preferencesCmdUnix.label "Voorkeure">
 <!ENTITY preferencesCmdUnix.accesskey "k">
 
 <!ENTITY viewMenu.label "Bekyk">
-<!ENTITY viewMenu.accesskey "b">
+<!ENTITY viewMenu.accesskey "B">
 <!ENTITY viewToolbarsMenu.label "Nutsbalke">
 <!ENTITY viewToolbarsMenu.accesskey "N">
 <!ENTITY showTaskbarCmd.label "Statusbalk">
 <!ENTITY showTaskbarCmd.accesskey "S">
 
 <!ENTITY proxy.label "Proxy Configuration…">
 <!ENTITY proxy.accesskey "C">
 
 <!ENTITY closeCmd.label "Sluit">
 <!ENTITY closeCmd.key "W">
-<!ENTITY closeCmd.accesskey "s">
+<!ENTITY closeCmd.accesskey "S">
 
 <!ENTITY quitApplicationCmd.label "Afsluit">
 <!ENTITY quitApplicationCmd.key "Q">
 <!ENTITY quitApplicationCmd.accesskey "s">
 
 <!ENTITY quitApplicationCmdUnix.label "Afsluit">
-<!ENTITY quitApplicationCmdUnix.accesskey "a">
+<!ENTITY quitApplicationCmdUnix.accesskey "A">
 
 <!ENTITY quitApplicationCmdMac.label "Quit &brandShortName;">
 <!ENTITY quitApplicationCmdMac.accesskey "q">
--- a/mail/chrome/messenger-mapi/mapi.properties
+++ b/mail/chrome/messenger-mapi/mapi.properties
@@ -1,24 +1,24 @@
 # Mail Integration Dialog
 dialogTitle=%S
-dialogText=Wil u %S as u verstek-posprogram gebruik?
+dialogText=Do you want to use %S as the default mail application? 
 newsDialogText=Wil u %S as u verstek-nuusprogram gebruik?
 feedDialogText=Wil u %S as u verstek-nuusvoerprogram gebruik?
 checkboxText=Moenie my weer vra nie
 setDefaultMail=%S is nie tans opgestel as u verstek-posprogram nie.  Wil u dit u verstek-posprogram maak?
 setDefaultNews=%S is nie tans opgestel as u verstek-nuusprogram nie.  Wil u dit u verstek-nuusprogram maak?
 setDefaultFeed=%S is nie tans opgestel as u verstek-nuusvoerprogram nie.  Wil u dit u verstek-nuusvoerprogram maak?
 alreadyDefaultMail=%S is reeds opgestel as u verstek-posprogram.
 alreadyDefaultNews=%S is reeds opgestel as u verstek-nuusprogram.
 alreadyDefaultFeed=%S is reeds opgestel as u verstek-nuusvoerprogram.
 
 # MAPI Messages
 loginText=Tik u wagwoord vir %S in:
-loginTextwithName=Tik u gebruikernaam en wagwoord
+loginTextwithName=Please enter your username and password 
 loginTitle=%S
 PasswordTitle=%S
 
 # MAPI Error Messages
 errorMessage=%S kon nie as u verstek-posprogram opgestel word nie omdat 'n registrysleutel nie bygewerk kon word nie. Maak by u stelselsadministrateur seker of u skryftoegang tot die stelsel se registry het, en probeer dan weer.
 errorMessageNews=%S kon nie as u verstek-nuusprogram opgestel word nie omdat 'n registrysleutel nie bygewerk kon word nie. Maak by u stelselsadministrateur seker of u skryftoegang tot die stelsel se registry het, en probeer dan weer.
 errorMessageTitle=%S
 
--- a/mail/chrome/messenger-newsblog/am-newsblog.dtd
+++ b/mail/chrome/messenger-newsblog/am-newsblog.dtd
@@ -1,20 +1,20 @@
-<!ENTITY newsblogTitle.label "RSS-rekeningopstelling">
+<!ENTITY accountTitle.label "Account Settings">
 
 <!ENTITY biffStart.label "Kontroleer vir nuwe artikels elke ">
 <!ENTITY biffStart.accesskey "r">
 <!ENTITY biffEnd.label "minute">
 
 <!ENTITY loginAtStartup.label "Kontroleer vir nuwe artikels aan die begin">
 <!ENTITY loginAtStartup.accesskey "K">
 
 <!ENTITY useQuickMode.label "Wys by verstek die artikelopsomming in plaas daarvan om die webbladsy te laai">
-<!ENTITY useQuickMode.accesskey "B">
+<!ENTITY useQuickMode.accesskey "b">
 
 <!ENTITY manageSubscriptions.label "Manage Subscriptions…">
 <!ENTITY manageSubscriptions.accesskey "M">
-<!-- entities from defaults/isp/rss.rdf -->
+<!-- entities from rss.rdf -->
 
-<!ENTITY rss.accountName "Nuus en webjoernale">
-<!ENTITY rss.wizardShortName "RSS">
-<!ENTITY rss.wizardLongName "RSS-nuus en webjoernale">
-<!ENTITY rss.wizardLongName.accesskey "R">
+<!ENTITY feeds.accountName "Blogs &amp; News Feeds">
+<!ENTITY feeds.wizardShortName "Voere">
+<!ENTITY feeds.wizardLongName "Blogs &amp; News Feeds">
+<!ENTITY feeds.wizardLongName.accesskey "F">
--- a/mail/chrome/messenger-newsblog/feed-subscriptions.dtd
+++ b/mail/chrome/messenger-newsblog/feed-subscriptions.dtd
@@ -1,18 +1,18 @@
 <!-- Subscription Dialog -->
-<!ENTITY newsBlogSubscriptions.label "RSS-intekeninge">
+<!ENTITY feedSubscriptions.label "Feed Subscriptions">
 <!ENTITY subscriptionDesc.label "Let wel: Om die vouer vir 'n nuusvoer te verwyder of te wysig sal nie voorheen afgelaaide artikels affekteer nie.">
 <!ENTITY feedTitle.label "Titel:">
 <!ENTITY location.label "Ligging:">
 
 <!ENTITY button.addFeed.label "Voeg by">
 <!ENTITY button.addFeed.accesskey "V">
 <!ENTITY button.editFeed.label "Redigeer">
 <!ENTITY button.editFeed.accesskey "R">
 <!ENTITY button.removeFeed.label "Verwyder">
 <!ENTITY button.removeFeed.accesskey "V">
 <!ENTITY button.importOPML.label "Invoer">
 <!ENTITY button.importOPML.accesskey "I">
 <!ENTITY button.exportOPML.label "Uitvoer">
-<!ENTITY button.exportOPML.accesskey "I">
+<!ENTITY button.exportOPML.accesskey "i">
 
 <!ENTITY cmd.close.commandKey "w">
--- a/mail/chrome/messenger-newsblog/newsblog.properties
+++ b/mail/chrome/messenger-newsblog/newsblog.properties
@@ -1,33 +1,35 @@
-# Status strings used in the subscribe dialog
-
-subscribe-validating=Verifying the RSS feed…
+subscribe-validating-feed=Verifying the feed…
 subscribe-cancelSubscription=Is u seker u wil die intekening op die huidige nuusvoer kanselleer?
 subscribe-cancelSubscriptionTitle=Subscribing to a Feed…
-subscribe-noFeedSelected=<geen RSS-nuusvoer gekies nie>
+subscribe-noFeedIsSelected=<no feed selected>
 subscribe-feedAlreadySubscribed=U het alreeds 'n intekening vir hierdie nuusvoer.
 subscribe-errorOpeningFile=Kon nie die lêer open nie.
 
 subscribe-OPMLImportTitle=Kies OPML-lêer om in te voer
 subscribe-OPMLExportTitle=Voer nuusvoer uit as 'n OPML-lêer
-subscribe-OPMLExportFileTitle=Thunderbird-OPML-uitvoer
-subscribe-OPMLExportFileName=MyThunderbirdFeeds.opml
-#LOCALIZATION NOTE: %S is the name of the OPML file the user tried to import.
+## LOCALIZATION NOTE(subscribe-OPMLExportFileDialogTitle): %S is the brandShortName
+subscribe-OPMLExportFileDialogTitle=%S OPML Export
+## LOCALIZATION NOTE(subscribe-OPMLExportDefaultFileName): %S is the brandShortName
+subscribe-OPMLExportDefaultFileName=My%SFeeds.opml
+## LOCALIZATION NOTE(subscribe-errorInvalidOPMLFile): %S is the name of the OPML file the user tried to import.
 subscribe-errorInvalidOPMLFile=%S is nie 'n geldige OPML-lêer nie, of kon nie die lêer invoer nie.
 
 subscribe-OPMLExportOPMLFilesFilterText=OPML-lêers
 
-#LOCALIZATION NOTE: %S is the name of the feed the user wants to unsubscribe from.
 subscribe-confirmFeedDeletionTitle=Verwyder nuusvoer
+## LOCALIZATION NOTE(subscribe-confirmFeedDeletion): %S is the name of the feed the user wants to unsubscribe from.
 subscribe-confirmFeedDeletion=Is u seker dat u van die nuusvoer wil afteken? \n %S?
 
-# when downloading new feed items from the subscribe dialog. 
-# LOCALIZATION NOTE: Do not translate %d in the following line.
-# The first %S will receive the number of messages received so far;
-# the second %S will receive the total number of messages
-subscribe-fetchingFeedItems=Laai tans nuusvoerartikels af (%S of %S)
+## LOCALIZATION NOTE(subscribe-gettingFeedItems):
+##  - The first %S is the number of articles processed so far;
+##  - The second %S is the total number of items
+subscribe-gettingFeedItems=Downloading feed articles (%S of %S)…
 
 newsblog-noNewArticlesForFeed=Daar is geen nuwe artikels vir hierdie nuusvoer nie.
+newsblog-networkErrorTitle=Network Error
+## LOCALIZATION NOTE(newsblog-networkError): %S is the feed URL
 newsblog-networkError=%S kon nie gevind word nie. Kontroleer die naam en probeer weer.
-newsblog-invalidFeed=%S is nie 'n geldige RSS-nuusvoer nie.
-newsblog-getNewMailCheck=Kontroleer tans RSS-nuusvoer vir nuwe items
-
+newsblog-feedNotValidTitle=Invalid Feed
+## LOCALIZATION NOTE(newsblog-feedNotValid): %S is the feed URL
+newsblog-feedNotValid=%S is not a valid feed.
+newsblog-getNewMsgsCheck=Checking feeds for new items…
--- a/mail/chrome/messenger-smime/msgCompSMIMEOverlay.dtd
+++ b/mail/chrome/messenger-smime/msgCompSMIMEOverlay.dtd
@@ -2,21 +2,21 @@
 
 <!ENTITY securityMenu.label "Sekuriteit">
 <!ENTITY securityMenu.accesskey "e">
 
 <!ENTITY menu_securityEncryptRequire.label "Enkripteer dié boodskap">
 <!ENTITY menu_securityEncryptRequire.accesskey "E">
 
 <!ENTITY menu_securityNoEncryption.label "Moenie dié boodskap enkripteer nie">
-<!ENTITY menu_securityNoEncryption.accesskey "N">
+<!ENTITY menu_securityNoEncryption.accesskey "n">
 
 <!ENTITY menu_securitySign.label "Onderteken hierdie boodskap digitaal">
-<!ENTITY menu_securitySign.accesskey "D">
+<!ENTITY menu_securitySign.accesskey "d">
 
 <!ENTITY menu_securityStatus.label "Bekyk sekuriteitsinligting">
-<!ENTITY menu_securityStatus.accesskey "I">
+<!ENTITY menu_securityStatus.accesskey "i">
 
 <!ENTITY securityButton.label "Sekuriteit">
 <!ENTITY securityButton.tooltip "Bekyk of wysig sekuriteitsopstelling">
 
 <!ENTITY menu_viewSecurityStatus.label "Boodskapsekuriteitsinligting">
-<!ENTITY menu_viewSecurityStatus.accesskey "I">
+<!ENTITY menu_viewSecurityStatus.accesskey "i">
--- a/mail/chrome/messenger-smime/msgReadSMIMEOverlay.dtd
+++ b/mail/chrome/messenger-smime/msgReadSMIMEOverlay.dtd
@@ -1,4 +1,4 @@
 <!--LOCALIZATION NOTE msgReadSMIMEOverlay.dtd UI for s/mime hooks in message reading -->
 
 <!ENTITY menu_securityStatus.label "Boodskapsekuriteitsinligting">
-<!ENTITY menu_securityStatus.accesskey "I">
+<!ENTITY menu_securityStatus.accesskey "i">
--- a/mail/chrome/messenger-smime/msgReadSMIMEOverlay.properties
+++ b/mail/chrome/messenger-smime/msgReadSMIMEOverlay.properties
@@ -1,7 +1,7 @@
 ImapOnDemand=Die vertoonde boodskap is digitaal onderteken, maar nog nie al die aanhegsels is afgelaai nie. Die ondertekening kan dus nie gevalideer word nie. Kliek OK om die hele boodskap af te laai en die ondertekening te valideer.
 #
 #NOTE To translater, anything between %..% and <..> should not be translated.
 # the former will be replaced by java script, and the latter is HTML formatting.
 #
 CantDecryptTitle=%brand% kan nie hierdie boodskap dekripteer nie
-CantDecryptBody=Die afsender het hierdie boodskap aan u met een van u digitale sertifikate geënkripteer, maar %brand% kon nie hierdie sertifikaat en sy ooreenstemmende private sleutel vind nie. <br> Moontlike oplossings: <br><ul><li>As u 'n knapkaart het, steek dit nou in. <li>As u 'n nuwe rekenaar gebruik, of u gebruik 'n nuwe %brand%-profiel, moet u u setifikaat en private sleutel van 'n dekkopie af verkry en herinstalleer. Sertifikaatdekkopieë eindig gewoonlik op ".p12".</ul>
+CantDecryptBody=The sender encrypted this message to you using one of your digital certificates, however %brand% was not able to find this certificate and corresponding private key. <br> Possible solutions: <br><ul><li>If you have a smartcard, please insert it now. <li>If you are using a new machine, or if you are using a new %brand% profile, you will need to restore your certificate and private key from a backup. Certificate backups usually end in ".p12".</ul> 
--- a/mail/chrome/messenger-smime/msgSecurityInfo.properties
+++ b/mail/chrome/messenger-smime/msgSecurityInfo.properties
@@ -1,40 +1,32 @@
 ## Signature Information strings
 SINoneLabel=Boodskap is nie digitaal onderteken nie
-SINone=Hierdie boodskap is nie deur die afsender digitaal onderteken nie. Aangesien die boodskap nie digitaal onderteken is nie, kon die boodskap moontlik deur iemand anders wat maak of hierdie hulle e-posadres is, gestuur gewees het. Dit is ook moontlik dat daar oor die netwerk onderweg aan die boodskap gepeuter is. Beide hierdie dinge is egter onwaarskynlik.
-
+SINone=This message does not include the sender's digital signature. The absence of a digital signature means that the message could have been sent by someone pretending to have this email address. It is also possible that the message has been altered while in transit over the network. However, it is unlikely that either event has occurred. 
 SIValidLabel=Boodskap is onderteken
 SIValid=Hierdie boodskap bevat 'n geldige digitale handtekening. Daar is nie aan die boodskap gepeuter sedert dit versend is nie.
-
 SIInvalidLabel=Digitale handtekening is ongeldig
 SIInvalidHeader=Hierdie boodskap is wel digitaal onderteken, maar die handtekening is ongeldig.
-
 SIContentAltered=Die handtekening kom nie korrek met die boodskapinhoud ooreen nie. Dit wil voorkom of daar aan die boodskap gepeuter is sedert dit versend is. U moet liefs nie hierdie boodskap as geldig beskou voor u die inhoud daarvan met die afsender uitgeklaar het nie.
 SIExpired=Dit wil voorkom of die sertifikaat waarmee die boodskap onderteken is, verval het. Maak seker dat u rekenaar se klok korrek opgestel is.
 SIRevoked=Die sertifikaat waarmee hierdie boodskap onderteken is, is opgehef. U moet liefs nie hierdie boodskap as geldig beskou voor u die inhoud daarvan met die afsender uitgeklaar het nie.
 SINotYetValid=Dit wil voorkom of die sertifikaat waarmee hierdie boodskap onderteken is, nog nie geldig is nie. Maak seker dat u rekenaar se klok korrek opgestel is.
 SIUnknownCA=Die sertifikaat waarmee hierdie boodskap onderteken is, is deur 'n onbekende sertifiseergesag uitgereik.
 SIUntrustedCA=Die sertifikaat wat waarmee hierdie boodskap onderteken is, is uitgereik deur 'n sertifiseergesag wat u nie vir die uitreik van hierdie soort sertifisering vertrou nie.
 SIExpiredCA=Die sertifikaat wat waarmee hierdie boodskap onderteken is, is uitgereik deur 'n sertifiseergesag wie se eie sertifisering verval nie. Maak seker dat u rekenaar se klok korrek opgestel is.
 SIRevokedCA=Die sertifikaat wat waarmee hierdie boodskap onderteken is, is uitgereik deur 'n sertifiseergesag wie se eie sertifisering opgehef is. U moet liefs nie hierdie boodskap as geldig beskou voor u die inhoud daarvan met die afsender uitgeklaar het nie.
 SINotYetValidCA=Die sertifikaat wat waarmee hierdie boodskap onderteken is, is uitgereik deur 'n sertifiseergesag wie se eie sertifisering nog nie geldig is nie. Maak seker dat u rekenaar se klok korrek opgestel is.
 SIInvalidCipher=Die boodskap is onderteken met 'n enkripsiesterkte wat nie met hierdie weergawe van u sagteware werk nie.
 SIClueless=Daar is fout met hierdie digitale handtekening. U moet liefs nie hierdie boodskap as geldig beskou voor u die inhoud daarvan met die afsender uitgeklaar het nie.
-
 SIPartiallyValidLabel=Boodskap is onderteken
 SIPartiallyValidHeader=Hoewel die digitale handtekening geldig is, is dit nie bekend of die afsender en die ondertekenaar dieselfde persoon is nie.
-
 SIHeaderMismatch=Die e-posadres wat in die ondertekenaar se sertifikaat gelys word, verskil van die e-posadres wat gebruik is om hierdie boodskap te onderteken. Kyk na die handtekeningsertifikaat se besonderhede om te bepaal wie die boodskap onderteken het.
 SICertWithoutAddress=Die sertifikaat waarmee hierdie boodskap onderteken is, bevat nie 'n e-posadres nie. Kyk na die handtekeningsertifikaat se besonderhede om te bepaal wie die boodskap onderteken het.
 
 ## Encryption Information strings
 EINoneLabel=Boodskap nie geënkripteer nie
 EINone=Hierdie boodskap is nie geënkripteer voor dit versend is nie. Inligting wat sonder enkripsie oor die internet versend word, kan onderweg deur ander mense gesien word.
-
 EIValidLabel=Boodskap is geënkripteer
 EIValid=Hierdie boodskap is geënkripteer voor dit na u versend is. Enkripsie maak dit baie moeilik vir ander mense om onderweg oor die netwerk na die inligting te kyk.
-
 EIInvalidLabel=Boodskap kan nie gedekripteer word nie
 EIInvalidHeader=Hierdie boodskap is geënkripteer voor dit na u versend is, maar dit kan nie gedekripteer word nie.
-
 EIContentAltered=Dit wil voorkom of die inhoud van die boodskap onderweg gewysig is.
 EIClueless=Daar is fout met hierdie geënkripteerde boodskap.
--- a/mail/chrome/messenger/AccountManager.dtd
+++ b/mail/chrome/messenger/AccountManager.dtd
@@ -7,15 +7,16 @@
 <!ENTITY setDefaultButton.label "Stel as verstek op">
 <!ENTITY setDefaultButton.accesskey "v">
 <!ENTITY removeButton.label "Verwyder rekening">
 <!ENTITY removeButton.accesskey "V">
 <!-- AccountManager.xul -->
 <!-- LOCALIZATION NOTE : this is part of an inline-style attribute on the account
      setting dialog, which specifies the width and height in em units of the dialog.
      Localizers ONLY can increase these widths if they are having difficulty getting
-     panel content to fit. 1em = the width of the letter 'm' in the selected font.
+     panel content to fit.
+     1ch = The width of the "0" (ZERO, U+0030) glyph for the current font.
+     1em = The height of the font.
      XUL/FE DEVELOPERS: DO NOT MODIFY THIS VALUE. It represents the correct size of
      this window for en-US. -->
 
-<!ENTITY accountManager.size "width: 63em; height: 50em;">
-<!ENTITY macAccountManager.size "width: 68em; height: 50em;">
-<!ENTITY accountTree.width "width: 17em;">
+<!ENTITY accountManager.size "width: 97ch; height: 49em;">
+<!ENTITY accountTree.width "width: 31ch;">
--- a/mail/chrome/messenger/AccountWizard.dtd
+++ b/mail/chrome/messenger/AccountWizard.dtd
@@ -34,17 +34,17 @@
 <!-- Entities for Server page -->
 
 
 <!ENTITY serverTitle.label "Bedienerinligting">
 <!ENTITY incomingServerTypeDesc.label "Selekteer die soort inkomende bediener wat u gebruik.">
 <!-- LOCALIZATION NOTE (incomingServerNameDesc.label) : Do not translate "&quot;pop.example.net&quot;" in below line -->
 <!ENTITY incomingServerNameDesc.label "Tik die naam van u inkomende bediener in (byvoorbeeld, &quot;mail.voorbeeld.net&quot;).">
 <!ENTITY incomingServerLabel.label "Inkomende bediener:">
-<!ENTITY incomingServerLabel.accesskey "B">
+<!ENTITY incomingServerLabel.accesskey "b">
 <!-- LOCALIZATION NOTE (newsServerNameDesc.label) : Do not translate "NNTP" or the "&quot;" entities in below line -->
 <!ENTITY newsServerNameDesc.label "Tik die naam van u nuusgroep-bediener (NNTP) in (byvoorbeeld, &quot;news.voorbeeld.net&quot;).">
 <!-- LOCALIZATION NOTE (smtpServerDesc.label) : Do not translate "SMTP" and "&quot;smtp.example.net&quot;" in below line -->
 <!ENTITY smtpServerDesc.label "Tik die naam van u uitgaande bediener (SMTP) in (byvoorbeeld, &quot;smtp.voorbeeld.net&quot;).">
 <!ENTITY smtpServerLabel.label "Uitgaande bediener:">
 <!ENTITY smtpServerLabel.accesskey "U">
 <!ENTITY newsServerLabel.label "Newsgroup Server:">
 <!ENTITY newsServerLabel.accesskey "w">
--- a/mail/chrome/messenger/FilterListDialog.dtd
+++ b/mail/chrome/messenger/FilterListDialog.dtd
@@ -3,24 +3,24 @@
 <!ENTITY activeColumn.label "Geaktiveer">
 <!ENTITY newButton.label "New…">
 <!ENTITY newButton.accesskey "N">
 <!ENTITY editButton.label "Redigeer…">
 <!ENTITY editButton.accesskey "R">
 <!ENTITY deleteButton.label "Skrap">
 <!ENTITY deleteButton.accesskey "a">
 <!ENTITY reorderUpButton.label "Skuif op">
-<!ENTITY reorderUpButton.accesskey "O">
+<!ENTITY reorderUpButton.accesskey "o">
 <!ENTITY reorderDownButton.label "Skuif af">
-<!ENTITY reorderDownButton.accesskey "A">
+<!ENTITY reorderDownButton.accesskey "a">
 <!ENTITY filterHeader.label "Geaktiveerde filters loop outomaties in die volgorde hieronder.">
 <!ENTITY filtersForPrefix.label "Filters vir:">
 <!ENTITY filtersForPrefix.accesskey "F">
 <!ENTITY viewLogButton.label "Filterstaaflêer">
-<!ENTITY viewLogButton.accesskey "S">
+<!ENTITY viewLogButton.accesskey "s">
 <!ENTITY runFilters.label "Laat loop nou">
 <!ENTITY runFilters.accesskey "L">
 <!ENTITY stopFilters.label "Stop">
 <!ENTITY stopFilters.accesskey "S">
 <!ENTITY folderPickerPrefix.label "Laat gemêrkte filter(s) loop op:">
 <!ENTITY folderPickerPrefix.accesskey "k">
 <!ENTITY choosethis.label "kies hierdie vouer">
 <!ENTITY choosethisnewsserver.label "kies hierdie nuusbediener">
--- a/mail/chrome/messenger/aboutDialog.dtd
+++ b/mail/chrome/messenger/aboutDialog.dtd
@@ -1,10 +1,17 @@
 <!ENTITY aboutDialog.title "Aangaande &brandFullName;">
 <!ENTITY credits.label "Credits">
 <!ENTITY credits.accesskey "C">
-<!ENTITY aboutLink.label "&lt; About &brandFullName;">
-<!ENTITY aboutLink.accesskey "A">
+<!ENTITY aboutButton.label "&lt; Terug">
+<!ENTITY aboutButton.accesskey "T">
 <!ENTITY aboutVersion "weergawe">
 <!ENTITY copyrightText "&#169;1998-2009 Contributors. All Rights Reserved. Mozilla Thunderbird and the 
                                  Thunderbird logos are trademarks of the Mozilla Foundation.  All rights 
                                  reserved.">
+<!ENTITY aboutMenu.label "About">
+<!ENTITY aboutMenu.accesskey "A">
+<!ENTITY aboutRights.label "Your Rights">
+<!ENTITY aboutRights.accesskey "R">
+<!ENTITY aboutContributors.label "Contributors">
+<!ENTITY aboutContributors.accesskey "o">
+
 <!ENTITY cmdCloseMac.commandKey "w">
--- a/mail/chrome/messenger/aboutRights.dtd
+++ b/mail/chrome/messenger/aboutRights.dtd
@@ -1,12 +1,12 @@
 <!-- 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 "Aangaande u regte">
+<!ENTITY rights.title "About Your Rights">
+<!ENTITY rights.intro-header "About Your Rights">
 <!ENTITY rights.intro "&brandFullName; is vrye, oop sagteware wat deur 'n gemeenskap van derduisende mense van reg oor die wêreld gebou is. Hier is 'n paar dinge wat u moet weet:">
 <!-- Note on pointa / pointb / pointc form:
      These points each have an embedded link in the HTML, so each point is
      split into chunks for text before the link, the link text, and the text
      after the link. If a localized grammar doesn't need the before or after
      chunk, it can be left blank.
 
      Also note the leading/trailing whitespace in strings here, which is
@@ -57,10 +57,10 @@
 
 <!ENTITY rights.webservices-term1-unbranded "Enige toepaslike diensbepalings vir hierdie produk sal daar gelys wees.">
 <!-- points 1-7 text for branded builds -->
 
 <!ENTITY rights.webservices-term1 "&vendorShortName; kan die dienste na goeddunke opskort of wysig.">
 <!ENTITY rights.webservices-term2 "U kan hierdie dienste met die meegaande weergawe van &brandShortName; gebruik -- u het alle reg om dit te doen.  &vendorShortName; en sy lisensiegewers behou hulle alle ander regte in die dienste voor.  Hierdie bepalings is nie ten doel om enige regte in te perk wat ingevolge die oopbronlisensies wat op &brandShortName; en die ooreenstemmende bronkode-weergawes van &brandShortName; van toepassing is nie.">
 <!ENTITY rights.webservices-term3 "Die Dienste word voetstoots verskaf. &vendorShortName;, sy bydraers, lisensieerders en verspreiders ontken alle waarborge, hetsy uitdruklik of geïmpliseer, met inbegrip van, sonder beperking, waarborge dat die Dienste verhandelbaar is en geskik is vir u besondere doeleindes. U dra die volle risiko wat betref die keuse van die Dienste vir u doeleindes en die gehalte en prestasie van die Dienste. Sommige owerhede verbied die uitsluiting of beperking van geïmpliseerde waarborge.  Hierdie ontkenning is dus moontlik nie op u van toepassing nie.">
 <!ENTITY rights.webservices-term4 "Tensy die reg dit vereis is &vendorShortName; sy bydraers, lisensieerders en verspreiders nie aanspreeklik vir enige indirekte, spesiale, toevallige,  gevolg- of bestraffende skadevergoeding wat spruit uit, of op enige manier te doen het met, die gebruik van &brandShortName; en die Dienste nie. Die gesamentlike aanspreeklikheid van hierdie bepalings sal nie $500 (vyfhonderd dollars) oorskry nie. Sommige owerhede verbied die uitsluiting of beperking van sekere skadevergoeding. Hierdie uitsluiting is dus moontlik nie op u van toepassing nie.">
-<!ENTITY rights.webservices-term5 "&vendorShortName; kan hierdie bepalings van tyd tot tyd bywerk indien nodig. Hierdie bepalings mag nie gewysig of gekanselleer word sonder &vendorShortName; se skriftelike toestemming nie.">
+<!ENTITY rights.webservices-term5 "&vendorShortName; may update these terms as necessary from time to time. These terms may not be modified or canceled without &vendorShortName;'s written agreement.">
 <!ENTITY rights.webservices-term6 "Hierdie bepalings word beheer deur die reg van die Staat van Kalifornië, V.S.A., met die uitsluiting van die bepalings in verband met internasionale privaatreg. As beslis word dat enige deel van hierdie bepalings ongeldig of onafdwingbaar is, bly die oorblywende dele ten volle van krag. In die geval waar die vertaalde weergawe in stryd is met die Engelse weergawe van hierdie bepalings, sal die Engelse bepalings geld.">
--- a/mail/chrome/messenger/aboutRights.properties
+++ b/mail/chrome/messenger/aboutRights.properties
@@ -1,5 +1,4 @@
-aboutRightsTitle=Aangaande u regte
 buttonLabel=Ken u regte…
 buttonAccessKey=K
 # LOCALIZATION NOTE (notifyText): %S will be replaced by brandFullName from brand.properties
-notifyText=%S is vrye, oop sagteware van die niewins-Mozilla Stigting.
+notifyRightsText=%S is vrye, oopbronsagteware van die niewins-Mozilla Stigting.
--- a/mail/chrome/messenger/activity.properties
+++ b/mail/chrome/messenger/activity.properties
@@ -8,26 +8,31 @@ waitingForRetry=Waiting for retry
 completed=Afgehandel
 canceled=Gekanselleer
 
 # LOCALIZATION NOTE (yesterday): Displayed time for files finished yesterday
 yesterday=Gister
 # LOCALIZATION NOTE (monthDate): #1 month name; #2 date number; e.g., January 22
 monthDate=#1 #2
 
-# Send Message
+# LOCALIZATION NOTE (sendingMessages): this is used as a title for grouping processes in the activity manager when sending email.
+sendingMessages=Stuur tans boodskappe
+# LOCALIZATION NOTE (sendingMessageWithSubject): %S will be replaced by the subject of the message being sent.
 sendingMessage=Stuur tans boodskap
-# LOCALIZATION NOTE (sendingMessageTo): %S will be replaced by the first name or newsgroup that the message is being sent to.
-sendingMessageTo=Sending Message to %S
+sendingMessageWithSubject=Sending Message: %S
+copyMessage=Copying message to sent folder
 sentMessage=Sent Message
-# LOCALIZATION NOTE (sentMessageTo): %S will be replaced by the first name or newsgroup that the message was sent to.
-sentMessageTo=Sent Message to %S
+# LOCALIZATION NOTE (sentMessageWithSubject): %S will be replaced by the subject of the message being sent.
+sentMessageWithSubject=Sent Message: %S
 failedToSendMessage=Failed to send message
-# LOCALIZATION NOTE (failedToSendMessageTo): %S will be replaced by the first name or newsgroup that the message was being sent to.
-failedToSendMessageTo=Failed to send message to %S
+failedToCopyMessage=Failed to copy message
+# LOCALIZATION NOTE (failedToSendMessageWithSubject): %S will be replaced by the subject of the message being sent.
+failedToSendMessageWithSubject=Failed to send message: %S
+# LOCALIZATION NOTE (failedToCopyMessageWithSubject): %S will be replaced by the subject of the message being sent.
+failedToCopyMessageWithSubject=Failed to copy message: %S
 
 # LOCALIZATION NOTE (autosyncProcessProgress): Do not translate the word "%1$S", "%2$S" and "%3$S" below.
 # Place the word %1$S in your translation where the number of the message being downloaded should appear.
 # Place the word %2$S in your translation where the total number of pending messages should appear.
 # Place the word %3$S in your translation where the name of the folder being processed should appear.
 autosyncProcessProgress=Downloading %1$S of %2$S in %3$S
 # LOCALIZATION NOTE (autosyncProcessDisplayText): %S will be replaced by the folder name
 autosyncProcessDisplayText=Bringing folder %S up to date
@@ -35,24 +40,45 @@ autosyncProcessDisplayText=Bringing fold
 autosyncEventDisplayText=%S is up to date
 # LOCALIZATION NOTE (autosyncEventStatusText): %S will be replaced by total number of downloaded messages
 autosyncEventStatusText=Total number of messages downloaded: %S
 autosyncEventStatusTextNoMsgs=No messages downloaded
 # LOCALIZATION NOTE (autosyncContextDisplayText): %S will be replaced by the account name
 autosyncContextDisplayText=Synchronizing: %S
 
 # Message actions that show up in activity manager
-# LOCALIZATION NOTE (deletedMessages): #1 number of messages
-deletedMessages=Deleted #1 message;Deleted #1 messages
+# LOCALIZATION NOTE (deletedMessages2): #1 number of messages, #2 folder name
+deletedMessages2=Deleted #1 message from #2;Deleted #1 messages from #2
 # LOCALIZATION NOTE (movedMessages): #1 number of messages, #2 and #3: folder names
 movedMessages=Moved #1 message from #2 to #3;Moved #1 messages from #2 to #3
 # LOCALIZATION NOTE (copiedMessages): #1 number of messages, #2 and #3: folder names
 copiedMessages=Copied #1 message from #2 to #3;Copied #1 messages from #2 to #3
 # LOCALIZATION NOTE (fromServerToServer): #1 source server, #2 destination server
 fromServerToServer=from #1 to #2
 # LOCALIZATION NOTE (deletedFolder): #1 folder name
 deletedFolder=Deleted folder #1
 # LOCALIZATION NOTE (movedFolder): #1 and #2 are folder names
 movedFolder=Moved folder #1 into folder #2
 # LOCALIZATION NOTE (copiedFolder): #1 and #2 are folder names
 copiedFolder=Copied folder #1 into folder #2
 # LOCALIZATION NOTE (renamedFolder): #1 and #2 are folder names
 renamedFolder=Renamed folder #1 to #2
+indexing=Indexing messages
+# LOCALIZATION NOTE (indexingFolder): #1 is a folder name
+indexingFolder=Indexing messages in #1
+indexingStatusVague=Determining which messages to index
+# LOCALIZATION NOTE (indexingFolderStatusVague): #1 is a folder name
+indexingFolderStatusVague=Determining which messages to index in #1
+# LOCALIZATION NOTE (indexingStatusExact):
+#   #1 is the number of the message currently being indexed
+#   #2 is the total number of messages being indexed
+#   #3 is the percentage of indexing that is complete
+indexingStatusExact=Indexing #1 of #2 message;Indexing #1 of #2 messages (#3% complete)
+# LOCALIZATION NOTE (indexingFolderStatusExact):
+#   #1 is the number of the message currently being indexed
+#   #2 is the total number of messages being indexed
+#   #3 is the percentage of indexing that is complete
+#   #4 is a folder name
+indexingFolderStatusExact=Indexing #1 of #2 message in #4;Indexing #1 of #2 messages in #4 (#3% complete)
+# LOCALIZATION NOTE (indexedFolder): #1 number of messages; #2 folder name
+indexedFolder=Indexed #1 message in #2;Indexed #1 messages in #2
+# LOCALIZATION NOTE (indexedFolderStatus): #1 number of seconds spent indexing
+indexedFolderStatus=#1 second elapsed;#1 seconds elapsed
--- a/mail/chrome/messenger/addressbook/abCardOverlay.dtd
+++ b/mail/chrome/messenger/addressbook/abCardOverlay.dtd
@@ -31,17 +31,17 @@
  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 Contact.tab "Kontak">
-<!ENTITY Contact.accesskey "K">
+<!ENTITY Contact.accesskey "C">
 <!ENTITY Name.box "Naam">
 <!-- LOCALIZATION NOTE:
  NameField1, NameField2, PhoneticField1, PhoneticField2
  those fields are either LN or FN depends on the target country.
  "FirstName" and "LastName" can be swapped for id to change the order
  but they should not be translated (same applied to phonetic id).
  Make sure the translation of label corresponds to the order of id.
 -->
@@ -74,37 +74,37 @@
 <!ENTITY PreferMailFormat.label "Prefers to receive messages formatted as:">
 <!ENTITY PreferMailFormat.accesskey "v">
 <!ENTITY PlainText.label "Skoonteks">
 <!ENTITY HTML.label "HTML">
 <!ENTITY Unknown.label "Onbekend">
 <!ENTITY ScreenName.label "Skermnaam:">
 <!ENTITY ScreenName.accesskey "S">
 
-<!ENTITY allowRemoteContent.label "Allow remote images.">
-<!ENTITY allowRemoteContent.accesskey "r">
-<!ENTITY allowRemoteContent.tooltip "In HTML messages it is possible to
-embed images from remote sources. Opening such a message will open a
+<!ENTITY allowRemoteContent1.label "Allow remote content.">
+<!ENTITY allowRemoteContent1.accesskey "r">
+<!ENTITY allowRemoteContent1.tooltip "In HTML messages it is possible to
+embed content from remote sources. Opening such a message will open a
 connection to this external source. This may allow tracking of the
 message being read. Checking this box will allow such external embedded
-images in HTML messages from this contact.">
+content in HTML messages from this contact.">
 
 <!ENTITY WorkPhone.label "Work:">
 <!ENTITY WorkPhone.accesskey "k">
 <!ENTITY HomePhone.label "Home:">
 <!ENTITY HomePhone.accesskey "o">
 <!ENTITY FaxNumber.label "Faks:">
 <!ENTITY FaxNumber.accesskey "a">
 <!ENTITY PagerNumber.label "Pager:">
 <!ENTITY PagerNumber.accesskey "g">
 <!ENTITY CellularNumber.label "Selfoon:">
 <!ENTITY CellularNumber.accesskey "S">
 
 <!ENTITY Home.tab "Private">
-<!ENTITY Home.accesskey "w">
+<!ENTITY Home.accesskey "P">
 <!ENTITY HomeAddress.label "Address:">
 <!ENTITY HomeAddress.accesskey "A">
 <!ENTITY HomeAddress2.label "">
 <!ENTITY HomeAddress2.accesskey "">
 <!ENTITY HomeCity.label "City:">
 <!ENTITY HomeCity.accesskey "y">
 <!ENTITY HomeState.label "State/Province:">
 <!ENTITY HomeState.accesskey "S">
@@ -141,17 +141,17 @@ images in HTML messages from this contac
 <!ENTITY WorkZipCode.label "ZIP/Postal Code:">
 <!ENTITY WorkZipCode.accesskey "Z">
 <!ENTITY WorkCountry.label "Country:">
 <!ENTITY WorkCountry.accesskey "u">
 <!ENTITY WorkWebPage.label "Web Page:">
 <!ENTITY WorkWebPage.accesskey "e">
 
 <!ENTITY Other.tab "Ander">
-<!ENTITY Other.accesskey "l">
+<!ENTITY Other.accesskey "h">
 <!ENTITY Custom1.label "Doelmaak 1:">
 <!ENTITY Custom1.accesskey "1">
 <!ENTITY Custom2.label "Doelmaak 2:">
 <!ENTITY Custom2.accesskey "2">
 <!ENTITY Custom3.label "Doelmaak 3:">
 <!ENTITY Custom3.accesskey "3">
 <!ENTITY Custom4.label "Doelmaak 4:">
 <!ENTITY Custom4.accesskey "4">
--- a/mail/chrome/messenger/addressbook/abMailListDialog.dtd
+++ b/mail/chrome/messenger/addressbook/abMailListDialog.dtd
@@ -47,11 +47,11 @@
 <!-- See bug 58485, when we implement drag and drop, add 'or drag addresses' back in -->
 <!ENTITY AddressTitle.label "Tik e-posadresse in om hulle by die poslys te voeg:">
 <!ENTITY UpButton.label "Skuif op">
 <!ENTITY DownButton.label "Skuif af">
 <!-- Access Keys -->
 
 <!ENTITY addToAddressBook.accesskey "V">
 <!ENTITY ListName.accesskey "L">
-<!ENTITY ListNickName.accesskey "K">
+<!ENTITY ListNickName.accesskey "k">
 <!ENTITY ListDescription.accesskey "e">
 
--- a/mail/chrome/messenger/addressbook/abMainWindow.dtd
+++ b/mail/chrome/messenger/addressbook/abMainWindow.dtd
@@ -1,13 +1,13 @@
 <!ENTITY addressbookWindow.title "Adresboek">
 <!-- File Menu -->
 
 <!ENTITY fileMenu.label "Lêer">
-<!ENTITY fileMenu.accesskey "l">
+<!ENTITY fileMenu.accesskey "L">
 <!ENTITY newMenu.label "Nuwe">
 <!ENTITY newMenu.accesskey "N">
 <!ENTITY newContact.label "Address Book Contact…">
 <!ENTITY newContact.accesskey "C">
 <!ENTITY newContact.key "N">
 <!ENTITY newListCmd.label "Mailing List…">
 <!ENTITY newListCmd.accesskey "L">
 <!ENTITY newAddressBookCmd.label "Address Book…">
@@ -17,49 +17,49 @@
 <!ENTITY newMessageCmd.label "Boodskap">
 <!ENTITY newMessageCmd.key "M">
 <!ENTITY newMessageCmd.accesskey "o">
 <!-- LOCALIZATION NOTE (osxAddressBook) : These entities are only used on Mac -->
 <!ENTITY osxAddressBook.label "Use Mac OS X Address Book">
 <!ENTITY osxAddressBook.accesskey "O">
 <!ENTITY closeCmd.label "Sluit">
 <!ENTITY closeCmd.key "W">
-<!ENTITY closeCmd.accesskey "s">
+<!ENTITY closeCmd.accesskey "S">
 <!ENTITY printSetupCmd.label "Page Setup…">
 <!ENTITY printSetupCmd.accesskey "u">
 <!ENTITY printPreviewContactCmd.label "Print Preview Contact">
 <!ENTITY printPreviewContactCmd.accesskey "v">
 <!ENTITY printPreviewAddressBook.label "Drukvoorskou van adresboek">
-<!ENTITY printPreviewAddressBook.accesskey "B">
+<!ENTITY printPreviewAddressBook.accesskey "b">
 <!ENTITY printContactCmd.label "Print Contact…">
 <!ENTITY printContactCmd.accesskey "P">
 <!ENTITY printContactCmd.key "P">
 <!ENTITY printAddressBook.label "Print Address Book…">
 <!ENTITY printAddressBook.accesskey "A">
 <!-- Edit Menu -->
 
 <!ENTITY editMenu.label "Redigeer">
-<!ENTITY editMenu.accesskey "r">
+<!ENTITY editMenu.accesskey "R">
 <!ENTITY undoCmd.label "Ontdoen">
 <!ENTITY undoCmd.key "Z">
-<!ENTITY undoCmd.accesskey "o">
+<!ENTITY undoCmd.accesskey "O">
 <!ENTITY redoCmd.label "Herdoen">
 <!ENTITY redoCmd.key "Y">
-<!ENTITY redoCmd.accesskey "h">
+<!ENTITY redoCmd.accesskey "H">
 <!ENTITY cutCmd.label "Knip">
 <!ENTITY cutCmd.key "X">
 <!ENTITY cutCmd.accesskey "p">
 <!ENTITY copyCmd.label "Kopieer">
 <!ENTITY copyCmd.key "C">
-<!ENTITY copyCmd.accesskey "k">
+<!ENTITY copyCmd.accesskey "K">
 <!ENTITY pasteCmd.label "Plak">
 <!ENTITY pasteCmd.key "V">
-<!ENTITY pasteCmd.accesskey "p">
+<!ENTITY pasteCmd.accesskey "P">
 <!ENTITY deleteCmd.label "Skrap">
-<!ENTITY deleteCmd.accesskey "s">
+<!ENTITY deleteCmd.accesskey "S">
 <!ENTITY deleteAbCmd.label "Skrap adresboek">
 <!ENTITY deleteContactCmd.label "Delete Contact">
 <!ENTITY deleteContactsCmd.label "Delete Contacts">
 <!ENTITY deleteListCmd.label "Delete List">
 <!ENTITY deleteListsCmd.label "Delete Lists">
 <!ENTITY deleteItemsCmd.label "Delete Items">
 <!ENTITY selectAllCmd.label "Kies almal">
 <!ENTITY selectAllCmd.key "A">
@@ -71,68 +71,68 @@
 <!-- Swap FN/LN UI  Set to "false" to show swap fn/ln UI -->
 <!ENTITY hideSwapFnLnUI "true">
 <!ENTITY propertiesCmd.label "Properties…">
 <!ENTITY propertiesCmd.accesskey "i">
 <!ENTITY propertiesCmd.key "i">
 <!-- View Menu -->
 
 <!ENTITY viewMenu.label "Bekyk">
-<!ENTITY viewMenu.accesskey "b">
+<!ENTITY viewMenu.accesskey "B">
 <!ENTITY viewToolbarsMenu.label "Nutsbalke">
 <!ENTITY viewToolbarsMenu.accesskey "N">
 <!ENTITY showAbToolbarCmd.label "Adresboek-nutsbalk">
 <!ENTITY showAbToolbarCmd.accesskey "b">
 <!ENTITY showTaskbarCmd.label "Statusbalk">
 <!ENTITY showTaskbarCmd.accesskey "S">
 <!ENTITY customizeToolbar.label "Customize…">
 <!ENTITY customizeToolbar.accesskey "C">
 <!ENTITY showContactPane.label "Contact Summary Pane">
 <!ENTITY showContactPane.accesskey "C">
 <!ENTITY menu_ShowNameAs.label "Vertoon naam as">
 <!ENTITY menu_ShowNameAs.accesskey "n">
 <!ENTITY firstLastCmd.label "Voornaam en van">
-<!ENTITY firstLastCmd.accesskey "v">
+<!ENTITY firstLastCmd.accesskey "V">
 <!ENTITY lastFirstCmd.label "Van, en voornaam">
-<!ENTITY lastFirstCmd.accesskey "v">
+<!ENTITY lastFirstCmd.accesskey "V">
 <!ENTITY displayNameCmd.label "Vertoonnaam">
-<!ENTITY displayNameCmd.accesskey "v">
+<!ENTITY displayNameCmd.accesskey "V">
 <!ENTITY sortMenu.label "Rangskik volgens">
 <!ENTITY sortMenu.accesskey "R">
 <!-- Tools Menu -->
 
 <!ENTITY tasksMenu.label "Nutsgoed">
-<!ENTITY tasksMenu.accesskey "U">
+<!ENTITY tasksMenu.accesskey "u">
 <!ENTITY messengerCmd.label "Pos en nuusgroepe">
-<!ENTITY messengerCmd.accesskey "p">
+<!ENTITY messengerCmd.accesskey "P">
 <!ENTITY messengerCmd.commandkey "1">
 <!ENTITY searchAddressesCmd.label "Search Addresses…">
 <!ENTITY searchAddressesCmd.accesskey "S">
 <!ENTITY importCmd.label "Invoer…">
 <!ENTITY importCmd.accesskey "I">
 <!ENTITY exportCmd.label "Export…">
 <!ENTITY exportCmd.accesskey "E">
 <!ENTITY preferencesCmd.label "Opsies…">
 <!ENTITY preferencesCmd.accesskey "O">
 <!ENTITY preferencesCmdUnix.label "Voorkeure">
 <!ENTITY preferencesCmdUnix.accesskey "k">
 <!-- Address Book Toolbar and Context Menus -->  
 
 <!ENTITY newContactButton.label "New Contact">
 <!ENTITY newContactButton.accesskey "C">
 <!ENTITY newlistButton.label "Nuwe lys">
-<!ENTITY newlistButton.accesskey "L">
+<!ENTITY newlistButton.accesskey "l">
 <!ENTITY editButton2.label "Eienskappe">
 <!ENTITY editButton2.accesskey "E">
 <!ENTITY newmsgButton.label "Skryf">
 <!ENTITY newmsgButton.accesskey "S">
 <!ENTITY newIM.label "Kitsboodskappe">
 <!ENTITY newIM.accesskey "K">
-<!ENTITY deleteButton2.label "Skrap">
-<!ENTITY deleteButton2.accesskey "S">
+<!ENTITY deleteButton2.label "Delete">
+<!ENTITY deleteButton2.accesskey "D">
 <!-- Address Book Toolbar Tooltips -->
 
 <!ENTITY newContactButton.tooltip "Create a new address book contact">
 <!ENTITY newlistButton.tooltip "Skep nuwe lys">
 <!ENTITY editButton2.tooltip "Edit the selected item">
 <!ENTITY newmsgButton.tooltip "Stuur 'n posboodskap">
 <!ENTITY newIM.tooltip "Stuur 'n kitsboodskap of klets">
 <!ENTITY deleteButton2.tooltip "Delete selected item">
@@ -172,17 +172,17 @@
 <!ENTITY FaxNumber.accesskey "F">
 <!ENTITY HomePhone.label "Huisfoon">
 <!ENTITY HomePhone.accesskey "H">
 <!ENTITY WorkPhone.label "Werkfoon">
 <!ENTITY WorkPhone.accesskey "W">
 <!ENTITY sortAscending.label "Oplopend">
 <!ENTITY sortAscending.accesskey "O">
 <!ENTITY sortDescending.label "Aflopend">
-<!ENTITY sortDescending.accesskey "F">
+<!ENTITY sortDescending.accesskey "f">
 <!ENTITY _PhoneticName.label "Fonetiese naam">
 <!ENTITY _PhoneticName.accesskey "e">
 <!-- Card Summary Pane -->
 <!-- Box Headings -->
 
 <!ENTITY contact.heading "Kontak">
 <!ENTITY home.heading "Huis">
 <!ENTITY other.heading "Ander">
--- a/mail/chrome/messenger/addressbook/abResultsPaneOverlay.dtd
+++ b/mail/chrome/messenger/addressbook/abResultsPaneOverlay.dtd
@@ -60,9 +60,9 @@
 <!ENTITY HomePhone.accesskey "H">
 <!ENTITY WorkPhone.label "Werkfoon">
 <!ENTITY WorkPhone.accesskey "W">
 <!ENTITY ScreenName.label "Skermnaam">
 <!ENTITY ScreenName.accesskey "S">
 <!ENTITY sortAscending.label "Oplopend">
 <!ENTITY sortAscending.accesskey "O">
 <!ENTITY sortDescending.label "Aflopend">
-<!ENTITY sortDescending.accesskey "F">
+<!ENTITY sortDescending.accesskey "f">
--- a/mail/chrome/messenger/addressbook/addressBook.properties
+++ b/mail/chrome/messenger/addressbook/addressBook.properties
@@ -37,17 +37,17 @@
 #
 # ***** END LICENSE BLOCK *****
 
 #
 # The following are used by the Mailing list dialog
 #
 emptyListName=U moet 'n lysnaam intik.
 lastFirstFormat=%S, %S
-firstLastFormat=%S %S
+firstLastFormat=%S %S  
 
 newContactTitle=New Contact
 # %S will be the contact's display name
 newContactTitleWithDisplayName=New Contact for %S
 editContactTitle=Edit Contact
 # %S will be the contact's display name
 editContactTitleWithDisplayName=Edit Contact for %S
 # don't translate vCard
@@ -125,20 +125,25 @@ ldap_2.servers.osx.description=Mac OS X 
 ## LOCALIZATION NOTE (totalContactStatus):
 ## %1$S is address book name, %2$S is contact count
 totalContactStatus=Total contacts in %1$S: %2$S
 ## LOCALIZATION NOTE (matchesFound):  do not localize %S
 noMatchFound=Geen resultate gevind nie
 matchFound=1 resultaat gevind
 matchesFound=%S resultate gevind
 
-cardsCopied=%S kaarte gekopieer
-cardCopied=1 kaart gekopieer
-cardsMoved=%S kaarte verskuif
-cardMoved=1 kaart verskuif
+## LOCALIZATION NOTE (contactsCopied): Semi-colon list of plural forms
+## %1$S is the number of contacts that were copied. This should be used multiple
+## times wherever you need it. Do not replace by %S.
+contactsCopied=%1$S contact copied;%1$S contacts copied
+
+## LOCALIZATION NOTE (contactsMoved): Semi-colon list of plural forms
+## %1$S is the number of contacts that were moved. This should be used multiple
+## times wherever you need it. Do not replace by %S.
+contactsMoved=%1$S contact moved;%1$S contacts moved
 
 # LDAP directory stuff
 invalidName=Tik 'n geldige naam in.
 invalidHostname=Tik 'n geldige gasheernaam in.
 invalidPortNumber=Tik 'n geldige poortnommer in.
 invalidResults=Tik 'n geldige getal in die resultateveld in.
 abReplicationOfflineWarning=U moet aanlyn werk om 'n LDAP te repliseer.
 abReplicationSaveSettings=Die opstelling moet gestoor word voor u 'n gids kan aflaai.
--- a/mail/chrome/messenger/addressbook/pref-directory-add.dtd
+++ b/mail/chrome/messenger/addressbook/pref-directory-add.dtd
@@ -32,41 +32,48 @@
  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 newDirectoryTitle.label "Gidsbediener-eienskappe">
 <!ENTITY directoryName.label "Naam: ">
-<!ENTITY directoryName.accesskey "n">
+<!ENTITY directoryName.accesskey "N">
 <!ENTITY directoryHostname.label "Gasheernaam: ">
 <!ENTITY directoryHostname.accesskey "a">
 <!ENTITY directoryBaseDN.label "Basis-DN: ">
-<!ENTITY directoryBaseDN.accesskey "b">
+<!ENTITY directoryBaseDN.accesskey "B">
 <!ENTITY findButton.label "Vind">
-<!ENTITY findButton.accesskey "v">
+<!ENTITY findButton.accesskey "V">
 <!ENTITY directorySecure.label "Gebruik beveiligde verbinding (SSL)">
 <!ENTITY directorySecure.accesskey "G">
 <!ENTITY directoryLogin.label "Bind-DN: ">
 <!ENTITY directoryLogin.accesskey "i">
 <!ENTITY General.tab "Algemeen">
 <!ENTITY Offline.tab "Aflyn">
 <!ENTITY Advanced.tab "Gevorderd">
 <!ENTITY portNumber.label "Poortnommer: ">
-<!ENTITY portNumber.accesskey "p">
+<!ENTITY portNumber.accesskey "P">
 <!ENTITY searchFilter.label "Soek-filter: ">
 <!ENTITY searchFilter.accesskey "f">
 <!ENTITY scope.label "Omvang: ">
 <!ENTITY scope.accesskey "m">
 <!ENTITY scopeOneLevel.label "Een vlak">
-<!ENTITY scopeOneLevel.accesskey "V">
+<!ENTITY scopeOneLevel.accesskey "v">
 <!ENTITY scopeSubtree.label "Subboom">
 <!ENTITY scopeSubtree.accesskey "S">
 <!ENTITY return.label "Moenie meer as">
 <!ENTITY return.accesskey "m">
 <!ENTITY results.label "resultate oplewer nie">
 <!ENTITY offlineText.label "U kan hierdie gids aflaai sodat dit beskikbaar is wanneer u aflyn werk.">
+<!ENTITY saslMechanism.label "Login method: ">
+<!ENTITY saslMechanism.accesskey "m">
+<!ENTITY saslOff.label "Simple">
+<!ENTITY saslOff.accesskey "l">
+<!ENTITY saslGSSAPI.label "Kerberos (GSSAPI)">
+<!ENTITY saslGSSAPI.accesskey "K">
 <!-- Localization note: this is here because the width of the dialog 
      is determined by the width of the base DN box; and that is likely
      to vary somewhat with the language.
 -->
+
 <!ENTITY newDirectoryWidth "36em">
--- a/mail/chrome/messenger/addressbook/pref-directory.dtd
+++ b/mail/chrome/messenger/addressbook/pref-directory.dtd
@@ -38,13 +38,13 @@
 
 <!ENTITY pref.ldap.window.title "LDAP-gidsbedieners">
 <!-- LOCALIZATION NOTE (directories.label) : do not translate "LDAP" in below line -->
 <!ENTITY directories.label "LDAP-gidsbediener:">
 <!-- LOCALIZATION NOTE (directoriesText.label) : do not translate "LDAP" in below line -->
 <!ENTITY directoriesText.label "Kies 'n LDAP-gidsbediener:">
 <!ENTITY directoriesText.accesskey "K">
 <!ENTITY addDirectory.label "Voeg by">
-<!ENTITY addDirectory.accesskey "v">
+<!ENTITY addDirectory.accesskey "V">
 <!ENTITY editDirectory.label "Redigeer">
-<!ENTITY editDirectory.accesskey "r">
+<!ENTITY editDirectory.accesskey "R">
 <!ENTITY deleteDirectory.label "Skrap">
-<!ENTITY deleteDirectory.accesskey "s">
+<!ENTITY deleteDirectory.accesskey "S">
--- a/mail/chrome/messenger/addressbook/replicationProgress.properties
+++ b/mail/chrome/messenger/addressbook/replicationProgress.properties
@@ -40,11 +40,11 @@ changesStarted=Started finding changes to replicate…
 replicationSucceeded=Replikasie suksesvol
 replicationFailed=Replikasie het misluk
 replicationCancelled=Replikasie gekanselleer
 # LOCALIZATION NOTE
 # do not localize %S.  %S is the current entry number (an integer)
 currentCount=Replikasie-gidsinskrywing: %S
 
 downloadButton=Laai nou af
-downloadButton.accesskey=L
+downloadButton.accesskey=D
 cancelDownloadButton=Kanselleer aflaai
-cancelDownloadButton.accesskey=K
+cancelDownloadButton.accesskey=C
--- a/mail/chrome/messenger/am-addressing.dtd
+++ b/mail/chrome/messenger/am-addressing.dtd
@@ -5,17 +5,17 @@
 <!ENTITY addressingText.label "Wanneer adresse deursoek word:">
 <!-- LOCALIZATION NOTE (override.label) : do not translate "LDAP" in below line -->
 <!ENTITY useGlobal.label "Gebruik die algemene LDAP-bedienervoorkeure vir hierdie rekening">
 <!ENTITY useGlobal.accesskey "G">
 <!ENTITY editDirectories.label "Edit Directories…">
 <!ENTITY editDirectories.accesskey "E">
 <!-- LOCALIZATION NOTE (directories.label) : do not translate "LDAP" in below line -->
 <!ENTITY directories.label "Gebruik 'n ander LDAP-bediener:">
-<!ENTITY directories.accesskey "d">
+<!ENTITY directories.accesskey "D">
 <!ENTITY directoriesNone.label "Geen">
 <!-- am-addressing.xul -->
 
 
 <!ENTITY compositionGroupTitle.label "Opstelling">
 <!-- LOCALIZATION NOTE (useHtml.label) : do not translate "html" in below line -->
 <!ENTITY useHtml.label "Skryf boodskappe in HTML-formaat">
 <!ENTITY useHtml.accesskey "S">
@@ -26,8 +26,12 @@
 <!ENTITY then.accesskey "D">
 <!ENTITY aboveQuote.label "begin my antwoord bo die aangehaalde teks">
 <!ENTITY belowQuote.label "begin my antwoord onder die aangehaalde teks">
 <!ENTITY selectAndQuote.label "merk die aanhaling">
 <!ENTITY place.label "and place my signature">
 <!ENTITY place.accesskey "s">
 <!ENTITY belowText.label "onder die aanhaling (aanbeveel)">
 <!ENTITY aboveText.label "begin my antwoord (bokant aanhaalde)">
+<!ENTITY includeSigOnReply.label "Include signature for replies">
+<!ENTITY includeSigOnReply.accesskey "s">
+<!ENTITY includeSigOnForward.label "Include signature for forwards">
+<!ENTITY includeSigOnForward.accesskey "w">
--- a/mail/chrome/messenger/am-copies.dtd
+++ b/mail/chrome/messenger/am-copies.dtd
@@ -18,20 +18,20 @@
 <!ENTITY sentInOtherFolder.accesskey "A">
 <!-- LOCALIZATION NOTE (draftsFolderOn.label): OK to translate this, bug #57440 -->
 <!ENTITY draftsFolderOn.label "&quot;Onvoltooid&quot;-vouer op:">
 <!ENTITY draftsFolderOn.accesskey "O">
 <!ENTITY draftInOtherFolder.label "Ander:">
 <!ENTITY draftInOtherFolder.accesskey "n">
 <!-- LOCALIZATION NOTE (archivesFolderOn.label): OK to translate this, bug #57440 -->
 <!ENTITY archivesFolderOn.label "&quot;Archives&quot; Folder on:">
-<!ENTITY archivesFolderOn.accesskey "D">
-<!ENTITY archiveInOtherFolder.label "Ander:">
-<!ENTITY archiveInOtherFolder.accesskey "n">
+<!ENTITY archivesFolderOn.accesskey "n">
+<!ENTITY archiveInOtherFolder.label "Other:">
+<!ENTITY archiveInOtherFolder.accesskey "h">
 <!-- LOCALIZATION NOTE (templatesFolderOn.label): OK to translate this, bug #57440 -->
 <!ENTITY templatesFolderOn.label "&quot;Sjablone&quot;-vouer op:">
 <!ENTITY templatesFolderOn.accesskey "a">
 <!ENTITY templateInOtherFolder.label "Other:">
 <!ENTITY templateInOtherFolder.accesskey "e">
 <!ENTITY specialFoldersTitle.label "Drafts, Archives, and Templates">
-<!ENTITY keepDrafts.label "Bêre onvoltooide boodskappe in:">
+<!ENTITY keepDrafts.label "Keep message drafts in:">
 <!ENTITY keepArchives.label "Keep message archives in:">
-<!ENTITY keepTempltes.label "Bêre boodskapsjablone in:">
+<!ENTITY keepTempltes.label "Keep message templates in:">
--- a/mail/chrome/messenger/am-main.dtd
+++ b/mail/chrome/messenger/am-main.dtd
@@ -1,33 +1,37 @@
 <!-- extracted from am-main.xul -->
 
 <!ENTITY accountTitle.label "Rekeningopstelling">
 <!ENTITY accountName.label "Gebruikernaam:">
-<!ENTITY accountName.accesskey "N">
+<!ENTITY accountName.accesskey "n">
 <!ENTITY identityTitle.label "Verstekidentiteit">
 <!ENTITY identityDesc.label "Elke rekening het 'n identiteit. Die identiteit is die inligting wat ander mense sien wanneer hulle u boodskappe lees.">
 <!ENTITY name.label "U naam:">
 <!ENTITY name.accesskey "U">
 <!ENTITY email.label "E-posadres:">
 <!ENTITY email.accesskey "E">
 <!ENTITY replyTo.label "Antwoordadres:">
 <!ENTITY replyTo.accesskey "s">
 <!ENTITY organization.label "Organisasie:">
 <!ENTITY organization.accesskey "O">
-<!ENTITY signature.label "Las hierdie handtekening by:">
-<!ENTITY signature.accesskey "l">
+<!ENTITY signatureText.label "Signature text:">
+<!ENTITY signatureText.accesskey "x">
+<!ENTITY signatureHtml.label "Use HTML (e.g., &lt;b&gt;bold&lt;/b&gt;)">
+<!ENTITY signatureHtml.accesskey "L">
+<!ENTITY signatureFile.label "Attach the signature from a file instead (text, HTML, or image):">
+<!ENTITY signatureFile.accesskey "t">
 <!ENTITY edit.label "Edit…">
 <!ENTITY choose.label "Kies…">
 <!ENTITY choose.accesskey "K">
 <!ENTITY editVCard.label "Edit Card…">
 <!ENTITY editVCard.accesskey "d">
 <!-- LOCALIZATION NOTE (attachVCard.label) : do not translate "vCard" in below line -->
 <!ENTITY attachVCard.label "Heg my vCard aan boodskappe">
 <!ENTITY attachVCard.accesskey "v">
 
 <!ENTITY manageIdentities.label "Manage Identities…">
 <!ENTITY manageIdentities.accesskey "M">
 <!-- LOCALIZATION NOTE (smtpName.label) : do not translate "SMTP" in below line -->
 
 <!ENTITY smtpName.label "Uitgaande bediener (SMTP):">
-<!ENTITY smtpName.accesskey "u">
+<!ENTITY smtpName.accesskey "U">
 <!ENTITY smtpDefaultServer.label "Gebruik verstekbediener">
--- a/mail/chrome/messenger/am-mdn.dtd
+++ b/mail/chrome/messenger/am-mdn.dtd
@@ -2,17 +2,17 @@
 <!ENTITY useGlobalPrefs.label "Gebruik my algemene antwoordstrokie-voorkeure vir hierdie rekening">
 <!ENTITY useGlobalPrefs.accesskey "G">
 <!ENTITY useCustomPrefs.label "Pasmaak antwoordstrokies vir hierdie rekening">
 <!ENTITY useCustomPrefs.accesskey "P">
 <!ENTITY requestReceipt.label "Wanneer boodskappe gestuur word, vra altyd 'n antwoordstrokie aan">
 <!ENTITY requestReceipt.accesskey "W">
 <!ENTITY receiptArrive.label "Wanneer 'n strokie aankom:">
 <!ENTITY leaveIt.label "Los dit in my inmandjie">
-<!ENTITY leaveIt.accesskey "I">
+<!ENTITY leaveIt.accesskey "i">
 <!-- LOCALIZATION NOTE moveToSent.label Translate: 'Sent' according to Netscape glossary -->
 <!ENTITY moveToSent.label "Verskuif dit na my &quot;Gestuur&quot;-vouer">
 <!ENTITY moveToSent.accesskey "V">
 <!ENTITY requestMDN.label "Wanneer ek 'n versoek om antwoordstrokie ontvang:">
 <!ENTITY returnSome.label "Laat antwoordstrokies vir sommige boodskappe toe">
 <!ENTITY returnSome.accesskey "a">
 <!ENTITY never.label "Moet nooit 'n antwoordstrokie stuur nie">
 <!ENTITY never.accesskey "M">
--- a/mail/chrome/messenger/am-offline.dtd
+++ b/mail/chrome/messenger/am-offline.dtd
@@ -13,22 +13,22 @@
 <!ENTITY nntpDownloadMsg.accesskey "o">
 <!ENTITY retentionCleanup.label "To recover disk space, old messages can be permanently deleted.">
 <!ENTITY retentionCleanupImap.label "To recover disk space, old messages can be permanently deleted, both local copies and originals on the remote server.">
 <!ENTITY retentionCleanupPop.label "To recover disk space, old messages can be permanently deleted, including originals on the remote server.">
 <!ENTITY retentionKeepMsg.label "Delete messages more than">
 <!ENTITY retentionKeepMsg.accesskey "t">
 <!ENTITY retentionKeepAll.label "Don't delete any messages">
 <!ENTITY retentionKeepAll.accesskey "n">
-<!ENTITY retentionKeepNew.label "Delete all but the last">
-<!ENTITY retentionKeepNew.accesskey "b">
-<!ENTITY retentionKeepUnread.label "Always delete read messages">
-<!ENTITY retentionKeepUnread.accesskey "w">
+<!ENTITY retentionKeepRecent.label "Delete all but the most recent">
+<!ENTITY retentionKeepRecent.accesskey "b">
+<!-- LOCALIZATION NOTE: Unhide with .keepUnreadOnly { display: -moz-box; } -->
+<!ENTITY retentionKeepUnreadHidden.label "Always delete read messages (overrides age settings)">
 <!ENTITY retentionApplyToFlagged.label "Always keep starred messages">
-<!ENTITY retentionApplyToFlagged.accesskey "e">
-<!ENTITY nntpRemoveBody.label "Verwyder boodskappe se inhoud wat ouer is as">
-<!ENTITY nntpRemoveBody.accesskey "W">
+<!ENTITY retentionApplyToFlagged.accesskey "k">
+<!ENTITY nntpRemoveMsgBody.label "Remove bodies from messages more than">
+<!ENTITY nntpRemoveMsgBody.accesskey "o">
 <!ENTITY offlineSelectNntp.label "Select newsgroups for offline use…">
 <!ENTITY offlineSelectNntp.accesskey "S">
 <!ENTITY offlineImapAdvancedOffline.label "Gevorderd…">
-<!ENTITY offlineImapAdvancedOffline.accesskey "G">
+<!ENTITY offlineImapAdvancedOffline.accesskey "v">
 <!ENTITY syncGroupTitle.label "Message Synchronizing">
 <!ENTITY diskspaceGroupTitle.label "Skyfspasie">
--- a/mail/chrome/messenger/am-server-advanced.dtd
+++ b/mail/chrome/messenger/am-server-advanced.dtd
@@ -1,14 +1,14 @@
 <!ENTITY serverAdvanced.label "Gevorderde rekeningopstelling">
 <!-- LOCALIZATION NOTE (serverDirectory.label): Do not translate "IMAP" -->
 <!ENTITY serverDirectory.label "IMAP-bedienergids:">
 <!ENTITY serverDirectory.accesskey "g">
 <!ENTITY usingSubscription.label "Wys net vouers waarop ingeteken">
-<!ENTITY usingSubscription.accesskey "w">
+<!ENTITY usingSubscription.accesskey "W">
 <!ENTITY dualUseFolders.label "Bediener werk met vouers wat subgidse en -boodskappe bevat">
 <!ENTITY dualUseFolders.accesskey "v">
 <!ENTITY useIdle.label "Gebruik IDLE-bevel indien die bedier daarmee wer">
 <!ENTITY useIdle.accesskey "I">
 <!ENTITY maximumConnectionsNumber.label "Maksimum getal bedienerverbindings te kas">
 <!ENTITY maximumConnectionsNumber.accesskey "M">
 <!-- LOCALIZATION NOTE (namespaceDesc.label): Do not translate "IMAP" -->
 <!ENTITY namespaceDesc.label "Hierdie voorkeure handel oor die naamsruimte op jou IMAP-bediener">
@@ -19,13 +19,13 @@
 <!ENTITY otherUsersNamespace.label "Ander gebruikers:">
 <!ENTITY otherUsersNamespace.accesskey "A">
 <!ENTITY overrideNamespaces.label "Laat bediener toe om hierdie naamruimtes te oorheers">
 <!ENTITY overrideNamespaces.accesskey "L">
 <!ENTITY pop3Desc.label "Wanneer u POP-pos vir hierdie bediener aflaai, gebruik die volgende vouer vir nuwe pos:">
 <!ENTITY globalInbox.label "Globale inkassie (rekening vir plaaslike vouers)">
 <!ENTITY globalInbox.accesskey "G">
 <!ENTITY accountDirectory.label "Inkassie vir hierdie bediener se rekening">
-<!ENTITY accountDirectory.accesskey "I">
+<!ENTITY accountDirectory.accesskey "i">
 <!ENTITY deferToServer.label "Inkassie vir 'n ander rekening">
-<!ENTITY deferToServer.accesskey "A">
+<!ENTITY deferToServer.accesskey "a">
 <!ENTITY deferGetNewMail.label "Sluit hierdie bediener in wanneer u nuwe pos kry">
 <!ENTITY deferGetNewMail.accesskey "S">
--- a/mail/chrome/messenger/am-server-top.dtd
+++ b/mail/chrome/messenger/am-server-top.dtd
@@ -1,17 +1,17 @@
 <!-- extracted from am-server-top.xul -->
 
 <!ENTITY securitySettings.label "Sekuriteitsopstelling">
 <!ENTITY serverSettings.label "Bedieneropstelling">
 <!ENTITY serverType.label "Bedienersoort:">
 <!ENTITY serverName.label "Bedienernaam:">
 <!ENTITY serverName.accesskey "B">
 <!ENTITY userName.label "Gebruikername:">
-<!ENTITY userName.accesskey "N">
+<!ENTITY userName.accesskey "n">
 <!ENTITY port.label "Poort:">
 <!ENTITY port.accesskey "P">
 <!ENTITY serverPortDefault.label "Verstek:">
 <!-- LOCALIZATION NOTE (biffStart.label) : translate below 2 line with grammer dependency
         For example, in Japanese cases:
                 biffStart.label "every"
                 biffEnd.label   "minutes for new messages Check"
 -->
@@ -23,18 +23,18 @@
 <!ENTITY connectionSecurityType-0.label "Geen">
 <!ENTITY connectionSecurityType-1.label "STARTTLS, if available">
 <!ENTITY connectionSecurityType-2.label "STARTTLS">
 <!ENTITY connectionSecurityType-3.label "SSL/TLS">
 <!ENTITY useSecAuth.label "Gebruik beveiligde magtiging">
 <!ENTITY useSecAuth.accesskey "i">
 <!ENTITY leaveOnServer.label "Laat boodskappe op bediener agter">
 <!ENTITY leaveOnServer.accesskey "a">
-<!ENTITY headersOnly.label "Haal net kopskrifte">
-<!ENTITY headersOnly.accesskey "h">
+<!ENTITY headersOnly.label "Fetch headers only">
+<!ENTITY headersOnly.accesskey "e">
 <!ENTITY deleteByAgeFromServer.label "Vir die meeste">
 <!ENTITY deleteByAgeFromServer.accesskey "i">
 <!ENTITY daysEnd.label "dae">
 <!ENTITY deleteOnServer2.label "Totdat ek dit skrap">
 <!ENTITY deleteOnServer2.accesskey "s">
 <!ENTITY downloadOnBiff.label "Laai outomaties nuwe boodskappe af">
 <!ENTITY downloadOnBiff.accesskey "e">
 <!ENTITY username.label "U aanmeldnaam">
--- a/mail/chrome/messenger/am-serverwithnoidentities.dtd
+++ b/mail/chrome/messenger/am-serverwithnoidentities.dtd
@@ -1,11 +1,11 @@
 <!ENTITY accountTitle.label "Rekeningopstelling">
 <!ENTITY accountSettingsDesc.label "Die volgende is 'n spesiale rekening.  Daar word geen identiteit mee geassosieer nie.">
 <!ENTITY accountName.label "Gebruikernaam:">
-<!ENTITY accountName.accesskey "N">
+<!ENTITY accountName.accesskey "n">
 <!ENTITY messageStorage.label "Boodskapbewaring">
 <!ENTITY emptyTrashOnExit.label "Maak snippermandjie leeg tydens afsluiting">
 <!ENTITY emptyTrashOnExit.accesskey "a">
 <!ENTITY localPath.label "Local directory:">
 <!ENTITY localFolderPicker.label "Kies plaaslike gids">
 <!ENTITY browseFolder.label "Blaai…">
 <!ENTITY browseFolder.accesskey "B">
--- a/mail/chrome/messenger/am-smime.dtd
+++ b/mail/chrome/messenger/am-smime.dtd
@@ -1,25 +1,25 @@
-<!ENTITY securityTitle.label "Sekuriteit">
-<!ENTITY securityTab.label "Sekuriteit">
+<!ENTITY securityTitle.label "Security">
+<!ENTITY securityTab.label "Security">
 <!ENTITY securityHeading.label "Om ondertekende of geënkripteerde boodskappe te stuur en te ontvang, moet u beide 'n ondertekening- en enkripsiesertifikaat toon.">
 <!ENTITY encryptionGroupTitle.label "Enkripsie">
 <!ENTITY encryptionChoiceLabel.label "Verstek-enkripsieopstelling vir wanneer boodskappe versend word:">
 <!ENTITY neverEncrypt.label "Never (do not use encryption)">
 <!ENTITY neverEncrypt.accesskey "N">
 <!ENTITY alwaysEncryptMessage.label "Required (can't send message unless all recipients have certificates)">
 <!ENTITY alwaysEncryptMessage.accesskey "u">
 <!ENTITY encryptionCert.message "Gebruik hierdie sertifikaat om boodskappe wat aan u gestuur word, te enkripteer en te dekripteer:">
 <!ENTITY digitalSign.certificate.button "Select…">
 <!ENTITY digitalSign.certificate.accesskey "S">
-<!ENTITY digitalSign.certificate_clear.button "Maak skoon">
-<!ENTITY digitalSign.certificate_clear.accesskey "K">
+<!ENTITY digitalSign.certificate_clear.button "Clear">
+<!ENTITY digitalSign.certificate_clear.accesskey "C">
 <!ENTITY encryption.certificate.button "Select…">
 <!ENTITY encryption.certificate.accesskey "t">
-<!ENTITY encryption.certificate_clear.button "Maak skoon">
+<!ENTITY encryption.certificate_clear.button "Clear">
 <!ENTITY encryption.certificate_clear.accesskey "e">
 <!ENTITY signingGroupTitle.label "Digitale ondertekening">
 <!ENTITY signMessage.label "Digitally sign messages (by default)">
 <!ENTITY signMessage.accesskey "D">
 <!ENTITY signingCert.message "Gebruik hierdie sertifikaat om boodskappe wat u versend, digitaal te onderteken:">
 
 <!ENTITY certificates.label "Sertifikate">
 <!ENTITY manageCerts.label "Bekyk sertifikate">
--- a/mail/chrome/messenger/appleMailImportMsgs.properties
+++ b/mail/chrome/messenger/appleMailImportMsgs.properties
@@ -55,10 +55,10 @@ 2002=Plaaslike boodskappe is suksesvol v
 ## @name APPLEMAILIMPORT_MAILBOX_BADPARAM
 ## @loc None
 2003='n Interne fout het voorgekom. Kon nie invoer nie. Probeer weer invoer.
 
 # Error message
 # LOCALIZATION NOTE : Do not translate the word "%S" below.
 ## @name APPLEMAILIMPORT_MAILBOX_CONVERTERROR
 ## @loc None
-2004=An error occurred while importing messages from %S. Messages were not imported.
+2004=An error occurred while importing messages from %S. Messages were not imported. 
 
--- a/mail/chrome/messenger/baseMenuOverlay.dtd
+++ b/mail/chrome/messenger/baseMenuOverlay.dtd
@@ -9,12 +9,11 @@
 <!ENTITY releaseCmd.accesskey "R">
 <!ENTITY openHelp.label "Hulpinhoud">
 <!ENTITY openHelp.accesskey "H">
 <!ENTITY openHelp.commandkey "VK_F1">
 <!ENTITY openHelpMac.label "&brandShortName;-hulp">
 <!ENTITY openHelpMac2.commandkey "?">
 <!ENTITY openHelpMac2.modifiers "accel">
 
-<!ENTITY updateCmd.label "Kontroleer vir bywerkings…">
-<!ENTITY updateCmd.accesskey "v">
+<!ENTITY updateCmd.label "Check for Updates…">
 <!ENTITY aboutCmd.label "Aangaande &brandFullName;">
 <!ENTITY aboutCmd.accesskey "A">
--- a/mail/chrome/messenger/filter.properties
+++ b/mail/chrome/messenger/filter.properties
@@ -12,16 +12,18 @@ filterCustomHeaderOverflow=U filters het die perk van 50 pasgemaakte kopskrifte oorskry. Redigeer die msgFilterRules.dat-lêer, wat u filters bevat, om minder pasgemaakte kopskrifte te gebruik.
 invalidCustomHeader=Een van u filters gebruik 'n pasgemaakte kopskrif wat 'n ongeldige karakter bevat, soos ':', 'n niedrukkarakter, 'n nie-ASCII-karakter of 'n 8-bis-ASCII-karakter. Redigeer die msgFilterRules.dat-lêer, wat u filters bevat, om ongeldige karakters uit u pasgemaakte kopskrifte te skrap.
 continueFilterExecution=Toepas van filter %S het misluk. Wil u voortgaan om die filters toe te pas?
 promptTitle=Huidig lopende filters
 promptMsg=U is tans besig om boodskappe te filter.\nWil u voortgaan om die filters toe te pas?
 stopButtonLabel=Stop
 continueButtonLabel=Gaan voort
 cannotEnableFilter=Hierdie filter is waarskynlik geskep deur 'n toekomstige weergawe van Mozilla/Netscape. U kan nie hierdie filter gebruik nie omdat ons nie weet hoe om dit toe te pas nie.
 dontWarnAboutDeleteCheckbox=Don't ask me again
+searchTermsInvalidTitle=Search Terms Invalid
+searchTermsInvalidMessage=This filter cannot be saved because some search terms are invalid in the current context.
 
 # for junk mail logging / mail filter logging
 # LOCALIZATION NOTE(junkLogDetectStr)
 # %1$S=author, %2$S=subject, %3$S=date
 junkLogDetectStr=Gemorsposboodskap van %1$S tot %2$S by %3$S geskrap
 # LOCALIZATION NOTE(logMoveStr)
 # %1$S=message id, %2$S=folder URI
 logMoveStr=boodskap-ID %1$S tot %2$S geskuif
@@ -33,19 +35,19 @@ logCopyStr=boodskap-ID %1$S tot %2$S gek
 filterLogDetectStr=Filter "%1$S" op boodskap van %2$S tot %3$S by %4$S toegepas
 filterMissingCustomAction=Missing Custom Action
 filterAction2=prioriteit het verander
 filterAction3=geskrap
 filterAction4=gemerk as gelees
 filterAction5=draad onderdruk
 filterAction6=draad dopgehou
 filterAction7=gevlag
-filterAction8=aangemerk
+filterAction8=tagged
 filterAction9=beantwoord
 filterAction10=aangestuur
 filterAction11=loopaksie gestop
 filterAction12=van POP3-bediener geskrap
 filterAction13=op POP3-bediener gelaat
 filterAction14=gemorspostelling
 filterAction15=lyf van POP3-bediener gehaal
 filterAction16=na vouer gekopieer
-filterAction17=aangemerk
+filterAction17=tagged
 filterAction18=ignored subthread
--- a/mail/chrome/messenger/folderProps.dtd
+++ b/mail/chrome/messenger/folderProps.dtd
@@ -37,17 +37,17 @@
    - the terms of any one of the MPL, the GPL or the LGPL.
    -
    - ***** END LICENSE BLOCK ***** -->
 
 <!ENTITY folderProps.windowtitle.label "Eienskappe">
 
 <!ENTITY generalInfo.label "Algemene inligting">
 <!ENTITY folderCharsetTab.label "Verstek-karakterenkodering:">
-<!ENTITY folderCharsetTab.accesskey "E">
+<!ENTITY folderCharsetTab.accesskey "e">
 <!ENTITY folderCharsetOverride.label "Pas verstek op alle boodskappe in die vouer toe (individuele boodskappe se karakterenkoderingopstelling en outospeur sal geïgnoreer word)">
 <!ENTITY folderCharsetOverride.accesskey "P">
 <!ENTITY folderRebuildSummaryFile.label "Herbou indeks">
 <!ENTITY folderRebuildSummaryFile.accesskey "H">
 <!ENTITY folderRebuildSummaryFileTip.label "Herbou opsomminglêer">
      
 <!ENTITY retention.label "Behoubeleid">
 <!ENTITY retentionUseDefault.label "Gebruik die bediener se verstek">
@@ -55,25 +55,25 @@
 <!ENTITY daysOld.label "dae oud">
 <!ENTITY message.label "boodskappe">
 <!ENTITY retentionCleanup.label "To recover disk space, old messages can be permanently deleted.">
 <!ENTITY retentionCleanupImap.label "To recover disk space, old messages can be permanently deleted, both local copies and originals on the remote server.">
 <!ENTITY retentionCleanupPop.label "To recover disk space, old messages can be permanently deleted, including originals on the remote server.">
 <!ENTITY retentionDeleteMsg.label "Skrap boodskappe van meer as">
 <!ENTITY retentionDeleteMsg.accesskey "b">
 <!ENTITY retentionKeepAll.label "Moenie enige boodskappe skrap nie">
-<!ENTITY retentionKeepAll.accesskey "E">
-<!ENTITY retentionKeepNew.label "Skrap alle behalwe die mees onlangse">
-<!ENTITY retentionKeepNew.accesskey "r">
-<!ENTITY retentionKeepUnread.label "Skrap atyd geleesde boodskappe">
-<!ENTITY retentionKeepUnread.accesskey "g">
+<!ENTITY retentionKeepAll.accesskey "e">
+<!ENTITY retentionKeepRecent.label "Delete all but the most recent">
+<!ENTITY retentionKeepRecent.accesskey "l">
+<!-- LOCALIZATION NOTE: Unhide with .keepUnreadOnly { display: -moz-box; } -->
+<!ENTITY retentionKeepUnreadHidden.label "Always delete read messages (overrides age settings)">
 <!ENTITY retentionApplyToFlagged.label "Always keep starred messages">
 <!ENTITY retentionApplyToFlagged.accesskey "e">
 
-<!ENTITY folderOfflineTab.label "Aflyn">
+<!ENTITY folderSynchronizationTab.label "Synchronization">
 <!ENTITY folderCheckForNewMessages.label "Kontroleer hierdie vouer vir nuwe boodskappe">
 <!ENTITY folderCheckForNewMessages.accesskey "K">
 
 <!ENTITY offlineFolder.check.label "Kies hierdie vouer vir aflyngebruik">
 <!ENTITY offlineFolder.check.accesskey "K">
 <!ENTITY offlineFolder.button.label "Laai nou af">
 <!ENTITY offlineFolder.button.accesskey "L">
 
--- a/mail/chrome/messenger/imapMsgs.properties
+++ b/mail/chrome/messenger/imapMsgs.properties
@@ -30,16 +30,23 @@
 # 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 *****
 
+imapLoginFailedTitle=Login Failed
+# LOCALIZATION NOTE (imapLoginFailed): Insert "%S" in your translation where
+# you wish to display the hostname of the server to which login failed.
+imapLoginFailed=Kon nie by bediener %S aanmeld nie.
+imapLoginFailedRetryButton=&Probeer weer
+imapLoginFailedEnterNewPasswordButton=&Enter New Password
+
 #
 # The following are used by the imap code to display progress/status/error messages
 #
 
 # Status - opening folder
 ## @name IMAP_STATUS_SELECTING_MAILBOX
 ## @loc None
 5000=Opening folder %S…
@@ -125,37 +132,16 @@ 5013=Sending login information…
 ## @name IMAP_STATUS_SENDING_AUTH_LOGIN
 ## @loc None
 5014=Sending login information…
 
 ## @name IMAP_DOWNLOADING_MESSAGE
 ## @loc None
 5015=Downloading message…
 
-## @name IMAP_STATUS_GETTING_NAMESPACE
-## @loc None
-# LOCALIZATION NOTE (Error 5020): Do not translate the word "IMAP" below.
-5020=Checking IMAP Namespace…
-
-## @name IMAP_UPGRADE_NO_PERSONAL_NAMESPACE
-## @loc None
-5021="Volgens die posbediener het u nie enige persoonlike posvouers nie. Maak seker van u intekeninge.
-
-## @name IMAP_UPGRADE_PROMPT_USER_2
-## @loc None
-5024=Enige vouers wat oningeteken gelaat word, sal nie in u vouerlyste verskyn nie, maar kan later op ingeteken word met Lêer / Inteken.
-
-## @name IMAP_UPGRADE_CUSTOM
-## @loc None
-5026=Please choose which folders you want subscribed in the Subscribe window…
-
-## @name IMAP_UPGRADE_SUCCESSFUL
-## @loc None
-5028=Die opgradering was suksesvol.
-
 ## @name IMAP_GETTING_ACL_FOR_FOLDER
 ## @loc None
 # LOCALIZATION NOTE (Error 5029): Do not translate the word "ACL" below.
 5029=Getting folder ACL…
 
 ## @name IMAP_GETTING_SERVER_INFO
 ## @loc None
 5030=Getting Server Configuration Info…
@@ -163,30 +149,16 @@ 5030=Getting Server Configuration Info…
 ## @name IMAP_GETTING_MAILBOX_INFO
 ## @loc None
 5031=Getting Mailbox Configuration Info…
 
 ## @name IMAP_EMPTY_MIME_PART
 ## @loc None
 5032=Hierdie deel van die lyf sal op versoek afgelaai word.
 
-## @name IMAP_UNABLE_TO_SAVE_MESSAGE
-## @loc None
-# LOCALIZATION NOTE (Error 5033): Do not translate the word "IMAP" below.
-5033=IMAP-probleem: Die boodskap kon vanweë 'n fout nie gestoor word nie.
-
-## @name IMAP_NO_ONLINE_FOLDER
-## @loc None
-# LOCALIZATION NOTE (Error 5034): Do not translate the word "IMAP" below.
-5034=IMAP-probleem: Kon nie die aanlynvouerinligting kry nie.
-
-## @name IMAP_LOGIN_FAILED
-## @loc None
-5035=Kon nie by bediener %S aanmeld nie.
-
 ## @name IMAP_RECEIVING_MESSAGE_HEADERS_OF
 ## @loc None
 # LOCALIZATION NOTE (Error 5036): Do not translate the word "%S" or "%lu" below.
 # Place the word %S in your translation where the name of the server should appear.
 # Place the word %lu where the number of headers should appear.
 5036=%S laai tans boodskapkopskrif %lu van %lu af
 
 ## @name IMAP_RECEIVING_MESSAGE_FLAGS_OF
@@ -223,22 +195,16 @@ 5041=Moving message to %S…
 5042=Copying messages to %S…
 
 ## @name IMAP_COPYING_MESSAGE_TO
 ## @loc None
 # LOCALIZATION NOTE (Error 5043): Do not translate the word "%S" below.
 # Place the word %S in your translation where the name of the folder should appear.
 5043=Copying message to %S…
 
-## @name IMAP_SELECTING_MAILBOX
-## @loc None
-# LOCALIZATION NOTE (Error 5044): Do not translate the word "%S" below.
-# Place the word %S in your translation where the name of the folder should appear.
-5044=Opening folder %S…
-
 ## @name IMAP_FOLDER_RECEIVING_MESSAGE_OF
 ## @loc None
 # LOCALIZATION NOTE (Error 5045): Do not translate the word "%S" or "%lu" below.
 # Place the word %S in your translation where the name of the folder should appear.
 # Place the word %lu where the number of headers should appear.
 5045=%S - laai tans boodskap %lu van %lu af
 
 ## @name IMAP_DISCOVERING_MAILBOX 
@@ -256,17 +222,17 @@ 5047=Tik u wagwoord vir %S in:
 
 ## @name IMAP_SERVER_NOT_IMAP4
 ## @loc None
 # LOCALIZATION NOTE (Error 5048): Do not translate the word "IMAP4" below.
 5048=Posbediener %S is nie 'n IMAP4-posbediener nie.
 
 ## @name IMAP_SERVER_SAID
 ## @loc None
-5049=Die huidige bevel het misluk.  Die posbediener se respons is:
+5049=The current command did not succeed.  The mail server responded: 
 
 ## @name IMAP_DONE
 ## @loc None
 5050=
 
 ## @name IMAP_ENTER_PASSWORD_PROMPT_TITLE
 ## @loc None
 5051=Posbedienerwagwoord verlang
@@ -305,17 +271,17 @@ 5062=Persoonlike liasseerkabinet
 5063=Geleesde pos
 
 ## @name IMAP_PFC_SENT_MAIL
 ## @loc None
 5064=Gestuurde pos
 
 ## @name IMAP_SPECIAL_CHAR
 ## @loc None
-5065= Die %c-karakter word op hierdie IMAP-bediener gereserveer. Kies 'n ander naam.
+5065= The %c character is reserved on this imap server. Please choose another name. 
 
 ## @name IMAP_PERSONAL_SHARED_FOLDER_TYPE_NAME
 ## @loc None
 5066=Persoonlike vouer
 
 ## @name IMAP_PUBLIC_FOLDER_TYPE_NAME
 ## @loc None
 5067=Openbare vouer
@@ -375,36 +341,28 @@ 5080=Skep subvouer
 ## @name IMAP_ACL_DELETE_RIGHT
 ## @loc None
 5081=Skrap boodskappe
 
 ## @name IMAP_ACL_ADMINISTER_RIGHT
 ## @loc None
 5082=Administreer vouer
 
-## @name IMAP_UNKNOWN_USER
-## @loc None
-5083=Onbekend
-
 ## @name IMAP_SERVER_DOESNT_SUPPORT_ACL
 ## @loc None
 5084=Hierdie bediener werk nie met gedeelde vouers nie.
 
 ## @name IMAP_ACL_EXPUNGE_RIGHT
 ## @loc None
 5085=Expunge
 
 ## @name IMAP_SERVER_DISCONNECTED
 ## @loc None
 5090= Bediener %S het ontkoppel. Die bediener het moontlik omgeval, of daar is 'n netwerkprobleem.
 
-## @name IMAP_REDIRECT_LOGIN_FAILED
-## @loc None
-5091=Kon nie aanmeld nie.
-
 # LOCALIZATION NOTE (autoSubscribeText): %1$S is the imap folder.
 5092=Wil u op %1$S inteken?
 
 ## @name IMAP_SERVER_DROPPED_CONNECTION
 ## @loc None
 5093=Kon nie aan u IMAP-bediener koppel nie. U het dalk die maksimum getal verbindings aan hierdie bediener gemaak. Indien wel, gebruik die "Gevorderde IMAP-bediener-opstelling"-dialoog om die getal gekaste verbindings te verminder.
 
 ## @name IMAP_QUOTA_STATUS_FOLDERNOTOPEN
@@ -431,20 +389,16 @@ 5102=U kan nie by %S aanmeld nie omdat u
 ## @name IMAP_COPYING_MESSAGE_OF
 ## @loc None
 # LOCALIZATION NOTE (Error 5103): Do not translate the word "%S" below.
 # Place the word %3$S in your translation where the name of the destination folder should appear.
 # Place the word %1$S where the currently copying message should appear.
 # Place the word %2$S where the total number of messages should appear.
 5103=Kopieer tans boodskap %1$S van %2$S na %3$S
 
-## @name IMAP_LOGIN_DISABLED
-## @loc None
-5104=U kan nie by %S aanmeld nie omdat die bediener aanmelding gedeaktiveer het. U moet moontlik per SSL of TLS koppel. Kontroleer die rekeningopstelling van u posbediener.
-
 ## @name IMAP_MOVE_FOLDER_TO_TRASH
 ## @loc None
 # LOCALIZATION NOTE (5105): Do not translate the word %S below.
 # "%S" is the the name of the folder.
 5105=Are you sure you want to delete the folder '%S'?
 
 ## @name IMAP_DELETE_NO_TRASH
 ## @loc None
@@ -454,8 +408,13 @@ 5106=Deleting this folder is not undoabl
 
 ## @name IMAP_DELETE_FOLDER_DIALOG_TITLE
 ## @loc None
 5107=Delete Folder
 
 ## @name IMAP_DELETE_FOLDER_BUTTON_LABEL
 ## @loc None
 5108=&Skrap vouer
+
+## @name IMAP_LOGIN_DISABLED
+## @loc None
+# LOCALIZATION NOTE (5109): %S is the server address
+5109=You cannot log in to %S because the server doesn't allow plaintext authentication without STARTTLS or SSL/TLS. Try enabling connection security or secure authentication in the account settings.
--- a/mail/chrome/messenger/localMsgs.properties
+++ b/mail/chrome/messenger/localMsgs.properties
@@ -162,17 +162,17 @@ 4023=Die snippermandjie bevat reeds 'n v
 
 # Status - stat failed
 ## @name POP3_STAT
 ## @loc None
 4024= Die STAT-bevel het misluk. Kon nie die nommer en grootte van boodskappe kry nie.
 
 ## @name POP3_SERVER_SAID
 ## @loc None
-4025= Posbediener %S se respons:
+4025= Mail server %S responded: 
 
 ## @name DELETING_MSGS_STATUS
 ## @loc None
 4026=Skrap tans %S van %S boodskappe
 
 ## @name COPYING_MSGS_STATUS
 ## @loc None
 4027=Kopieer tans %S van %S boodskappe na %S
--- a/mail/chrome/messenger/markByDate.dtd
+++ b/mail/chrome/messenger/markByDate.dtd
@@ -32,11 +32,11 @@
    - and other provisions required by the LGPL or the GPL. If you do not delete
    - the provisions above, a recipient may use your version of this file under
    - the terms of any one of the MPL, the GPL or the LGPL.
    -
    - ***** END LICENSE BLOCK ***** -->
 
 <!ENTITY messageMarkByDate.label "Merk boodskappe as gelees volgend datum">
 <!ENTITY markByDateLower.label "Merk boodskappe as gelees van:">
-<!ENTITY markByDateLower.accesskey "V">
+<!ENTITY markByDateLower.accesskey "v">
 <!ENTITY markByDateUpper.label "Aan:">
 <!ENTITY markByDateUpper.accesskey "A">
--- a/mail/chrome/messenger/messenger.dtd
+++ b/mail/chrome/messenger/messenger.dtd
@@ -1,664 +1,703 @@
-<!ENTITY messengerWindow.title "Mail &amp; Newsgroups">
+<!ENTITY messengerWindow.title "Pos- en nuusgroepe">
 <!ENTITY titledefault.label "&brandFullName;">
 <!ENTITY titleSeparator.label " - ">
 <!-- File Menu -->
 
 <!ENTITY newFolderCmd.label "Folder…">
 <!ENTITY newFolderCmd.accesskey "F">
-<!ENTITY closeTabCmd.label "Close Tab">
-<!ENTITY closeTabCmd.accesskey "e">
+<!ENTITY closeTabCmd.label "Sluit oortjie">
+<!ENTITY closeTabCmd.accesskey "u">
 <!ENTITY newVirtualFolderCmd.label "Saved Search…">
 <!ENTITY newVirtualFolderCmd.accesskey "S">
 <!ENTITY newAccountCmd.label "Account…">
 <!ENTITY newAccountCmd.accesskey "A">
+<!ENTITY newMailAccountCmd.label "Mail Account (Quick Setup)…">
+<!ENTITY newMailAccountCmd.accesskey "Q">
 <!ENTITY openMessageFileCmd.label "Open Saved Message…">
 <!ENTITY openMessageFileCmd.accesskey "O">
-<!ENTITY openAttachmentCmd.label "Attachments">
+<!ENTITY openAttachmentCmd.label "Aanhegsels">
 <!ENTITY openAttachmentCmd.accesskey "A">
-<!ENTITY saveAsMenu.label "Save As">
+<!ENTITY saveAsMenu.label "Stoor as">
 <!ENTITY saveAsMenu.accesskey "S">
-<!ENTITY saveAsFileCmd.label "File">
-<!ENTITY saveAsFileCmd.accesskey "F">
+<!ENTITY saveAsFileCmd.label "Lêer">
+<!ENTITY saveAsFileCmd.accesskey "L">
 <!ENTITY saveAsFileCmd.key "s">
-<!ENTITY saveAsTemplateCmd.label "Template">
-<!ENTITY saveAsTemplateCmd.accesskey "T">
+<!ENTITY saveAsTemplateCmd.label "Sjabloon">
+<!ENTITY saveAsTemplateCmd.accesskey "S">
 <!ENTITY getNewMsgCmd.key "t">
-<!ENTITY getNewMsgForCmd.label "Get New Messages for">
-<!ENTITY getNewMsgForCmd.accesskey "w">
+<!ENTITY getNewMsgForCmd.label "Kry nuwe boodskappe vir">
+<!ENTITY getNewMsgForCmd.accesskey "u">
 <!ENTITY getAllNewMsgCmdPopupMenu.label "All Accounts">
 <!ENTITY getAllNewMsgCmdPopupMenu.accesskey "A">
 <!ENTITY getNewMsgCurrentAccountCmdPopupMenu.label "Current Account">
 <!ENTITY getNewMsgCurrentAccountCmdPopupMenu.accesskey "C">
-<!ENTITY getNextNMsgCmd.label "Get Next 500 News Messages">
-<!ENTITY getNextNMsgCmd.accesskey "t">
-<!ENTITY sendUnsentCmd.label "Send Unsent Messages">
-<!ENTITY sendUnsentCmd.accesskey "d">
+<!ENTITY getNextNMsgCmd.label "Kry volgende 500 nuwe boodskappe">
+<!ENTITY getNextNMsgCmd.accesskey "y">
+<!ENTITY sendUnsentCmd.label "Stuur ongestuurde boodskappe">
+<!ENTITY sendUnsentCmd.accesskey "u">
 <!ENTITY subscribeCmd.label "Subscribe…">
 <!ENTITY subscribeCmd.accesskey "b">
 <!ENTITY deleteFolder.label "Delete Folder">
 <!ENTITY deleteFolder.accesskey "e">
 <!ENTITY renameFolder.label "Rename Folder…">
 <!ENTITY renameFolder.accesskey "R">
 <!ENTITY renameFolder.key "VK_F2">
 <!ENTITY compactFolders.label "Compact Folders">
 <!ENTITY compactFolders.accesskey "F">
-<!ENTITY emptyTrashCmd.label "Empty Trash">
-<!ENTITY emptyTrashCmd.accesskey "y">
-<!ENTITY importCmd.label "Import…">
-<!ENTITY importCmd.accesskey "I">
-<!ENTITY offlineMenu.label "Offline">
+<!ENTITY emptyTrashCmd.label "Maak snippermandjie leeg">
+<!ENTITY emptyTrashCmd.accesskey "M">
+<!ENTITY offlineMenu.label "Aflyn">
 <!ENTITY offlineMenu.accesskey "l">
-<!ENTITY offlineGoOfflineCmd.label "Work Offline">
-<!ENTITY offlineGoOfflineCmd.accesskey "w">
+<!ENTITY offlineGoOfflineCmd.label "Werk aflyn">
+<!ENTITY offlineGoOfflineCmd.accesskey "W">
 <!ENTITY synchronizeOfflineCmd.label "Download/Sync Now…">
 <!ENTITY synchronizeOfflineCmd.accesskey "S">
 <!ENTITY settingsOfflineCmd.label "Offline Settings…">
 <!ENTITY settingsOfflineCmd.accesskey "e">
-<!ENTITY downloadSelectedCmd.label "Get Selected Messages">
-<!ENTITY downloadSelectedCmd.accesskey "l">
-<!ENTITY downloadStarredCmd.label "Get Starred Messages">
-<!ENTITY downloadStarredCmd.accesskey "a">
+<!ENTITY downloadSelectedCmd.label "Kry gemerkte boodskappe">
+<!ENTITY downloadSelectedCmd.accesskey "K">
+<!ENTITY downloadStarredCmd.label "Kry gevlagde boodskappe">
+<!ENTITY downloadStarredCmd.accesskey "g">
 <!ENTITY printCmd.label "Print…">
 <!ENTITY printCmd.accesskey "P">
 <!ENTITY printCmd.key "p">
-<!ENTITY printPreviewCmd.label "Print Preview">
+<!ENTITY printPreviewCmd.label "Drukvoorskou">
 <!ENTITY printPreviewCmd.accesskey "v">
 <!ENTITY printSetupCmd.label "Page Setup…">
 <!ENTITY printSetupCmd.accesskey "u">
 <!-- Edit Menu -->
 
-<!ENTITY deleteMsgCmd.label "Delete Message">
-<!ENTITY deleteMsgCmd.accesskey "D">
-<!ENTITY undeleteMsgCmd.label "Undelete Message">
-<!ENTITY undeleteMsgCmd.accesskey "d">
-<!ENTITY cancelNewsMsgCmd.label "Cancel Message">
-<!ENTITY cancelNewsMsgCmd.accesskey "M">
-<!ENTITY deleteMsgsCmd.label "Delete Selected Messages">
-<!ENTITY deleteMsgsCmd.accesskey "D">
-<!ENTITY undeleteMsgsCmd.label "Undelete Selected Messages">
-<!ENTITY undeleteMsgsCmd.accesskey "d">
-<!ENTITY cancelNewsMsgsCmd.label "Cancel Selected Messages">
-<!ENTITY cancelNewsMsgsCmd.accesskey "n">
-<!ENTITY deleteFolderCmd.label "Delete Folder">
-<!ENTITY deleteFolderCmd.accesskey "D">
-<!ENTITY unsubscribeNewsgroupCmd.label "Unsubscribe">
-<!ENTITY unsubscribeNewsgroupCmd.accesskey "n">
-<!ENTITY selectMenu.label "Select">
-<!ENTITY selectMenu.accesskey "S">
-<!ENTITY all.label "All">
+<!ENTITY deleteMsgCmd.label "Skrap boodskap">
+<!ENTITY deleteMsgCmd.accesskey "S">
+<!ENTITY undeleteMsgCmd.label "Ontskrap boodskap">
+<!ENTITY undeleteMsgCmd.accesskey "t">
+<!ENTITY cancelNewsMsgCmd.label "Kanselleer boodskap">
+<!ENTITY cancelNewsMsgCmd.accesskey "b">
+<!ENTITY deleteMsgsCmd.label "Skrap gemerkte boodskappe">
+<!ENTITY deleteMsgsCmd.accesskey "S">
+<!ENTITY undeleteMsgsCmd.label "Ontskrap gemerkte boodskappe">
+<!ENTITY undeleteMsgsCmd.accesskey "t">
+<!ENTITY cancelNewsMsgsCmd.label "Kanselleer gemerkte boodskappe">
+<!ENTITY cancelNewsMsgsCmd.accesskey "s">
+<!ENTITY deleteFolderCmd.label "Skrap vouer">
+<!ENTITY deleteFolderCmd.accesskey "S">
+<!ENTITY unsubscribeNewsgroupCmd.label "Afteken">
+<!ENTITY unsubscribeNewsgroupCmd.accesskey "f">
+<!ENTITY selectMenu.label "Merk">
+<!ENTITY selectMenu.accesskey "M">
+<!ENTITY all.label "Almal">
 <!ENTITY all.accesskey "A">
-<!ENTITY selectThreadCmd.label "Thread">
-<!ENTITY selectThreadCmd.accesskey "T">
+<!ENTITY selectThreadCmd.label "Draad">
+<!ENTITY selectThreadCmd.accesskey "D">
 <!ENTITY selectThreadCmd.key "a">
 <!ENTITY selectFlaggedCmd.label "Starred Messages">
 <!ENTITY selectFlaggedCmd.accesskey "S">
 <!ENTITY menuFavoriteFolder.label "Favorite Folder">
-<!ENTITY menuFavoriteFolder.accesskey "a">
+<!ENTITY menuFavoriteFolder.accesskey "v">
 <!ENTITY folderPropsCmd.label "Properties…">
 <!ENTITY folderPropsFolderCmd.label "Folder Properties…">
 <!ENTITY folderPropsNewsgroupCmd.label "Newsgroup Properties…">
 <!ENTITY folderPropsCmd.accesskey "o">
-<!ENTITY accountManagerCmd.label "Account Settings…">
-<!ENTITY accountManagerCmd.accesskey "c">
-<!ENTITY accountManagerCmdUnix.accesskey "A">
-<!ENTITY undoDeleteMsgCmd.label "Undo Delete Message">
-<!ENTITY redoDeleteMsgCmd.label "Redo Delete Message">
-<!ENTITY undoMoveMsgCmd.label "Undo Move Message">
-<!ENTITY redoMoveMsgCmd.label "Redo Move Message">
-<!ENTITY undoCopyMsgCmd.label "Undo Copy Message">
-<!ENTITY redoCopyMsgCmd.label "Redo Copy Message">
+<!ENTITY undoDeleteMsgCmd.label "Ontdoen skrap van boodskap">
+<!ENTITY redoDeleteMsgCmd.label "Herdoen skrap van boodskap">
+<!ENTITY undoMoveMsgCmd.label "Ontdoen skuif van boodskap">
+<!ENTITY redoMoveMsgCmd.label "Herdoen skuif van boodskap">
+<!ENTITY undoCopyMsgCmd.label "Ontdoen kopieer van boodskap">
+<!ENTITY redoCopyMsgCmd.label "Herdoen kopieer van boodskap">
 <!ENTITY undoMarkAllCmd.label "Undo Mark All Read">
 <!ENTITY redoMarkAllCmd.label "Redo Mark All Read">
-<!ENTITY undoDefaultCmd.label "Undo">
-<!ENTITY undoDefaultCmd.accesskey "U">
-<!ENTITY redoDefaultCmd.label "Redo">
-<!ENTITY redoDefaultCmd.accesskey "R">
+<!ENTITY undoDefaultCmd.label "Ontdoen">
+<!ENTITY undoDefaultCmd.accesskey "O">
+<!ENTITY redoDefaultCmd.label "Herdoen">
+<!ENTITY redoDefaultCmd.accesskey "H">
 <!-- View Menu -->
 
-<!ENTITY showMessengerToolbarCmd.label "Mail Toolbar">
-<!ENTITY showMessengerToolbarCmd.accesskey "o">
+<!ENTITY showMessengerToolbarCmd.label "Posnutsbalk">
+<!ENTITY showMessengerToolbarCmd.accesskey "u">
 <!ENTITY customizeToolbar.label "Customize…">
 <!ENTITY customizeToolbar.accesskey "C">
 
-<!ENTITY messagePaneLayoutStyle.label "Layout">
-<!ENTITY messagePaneLayoutStyle.accesskey "L">
-<!ENTITY messagePaneClassic.label "Classic View">
-<!ENTITY messagePaneClassic.accesskey "C">
-<!ENTITY messagePaneWide.label "Wide View">
+<!ENTITY messagePaneLayoutStyle.label "Uitleg">
+<!ENTITY messagePaneLayoutStyle.accesskey "U">
+<!ENTITY messagePaneClassic.label "Klassieke aansig">
+<!ENTITY messagePaneClassic.accesskey "K">
+<!ENTITY messagePaneWide.label "Wye aansig">
 <!ENTITY messagePaneWide.accesskey "W">
-<!ENTITY messagePaneVertical.label "Vertical View">
+<!ENTITY messagePaneVertical.label "Vertikale aansig">
 <!ENTITY messagePaneVertical.accesskey "V">
-<!ENTITY showMessageCmd.label "Message Pane">
-<!ENTITY showMessageCmd.accesskey "M">
+<!ENTITY showMessageCmd.label "Boodskappaneel">
+<!ENTITY showMessageCmd.accesskey "B">
 
-<!ENTITY folderView.label "Folders">
-<!ENTITY folderView.accesskey "F">
-<!ENTITY allFolders.label "All">
+<!ENTITY folderView.label "Vouers">
+<!ENTITY folderView.accesskey "V">
+<!ENTITY allFolders.label "Almal">
 <!ENTITY allFolders.accesskey "A">
-<!ENTITY unreadFolders.label "Unread">
-<!ENTITY unreadFolders.accesskey "U">
-<!ENTITY favoriteFolders.label "Favorite">
-<!ENTITY favoriteFolders.accesskey "F">
-<!ENTITY recentFolders.label "Recent">
-<!ENTITY recentFolders.accesskey "R">
+<!ENTITY unreadFolders.label "Ongelees">
+<!ENTITY unreadFolders.accesskey "O">
+<!ENTITY favoriteFolders.label "Gunsteling">
+<!ENTITY favoriteFolders.accesskey "G">
+<!ENTITY recentFolders.label "Onlangs">
+<!ENTITY recentFolders.accesskey "O">
 <!-- Sort Menu -->
 
-<!ENTITY sortMenu.label "Sort by">
-<!ENTITY sortMenu.accesskey "S">
-<!ENTITY sortByDateCmd.label "Date">
-<!ENTITY sortByDateCmd.accesskey "e">
+<!ENTITY sortMenu.label "Rangskik volgens">
+<!ENTITY sortMenu.accesskey "R">
+<!ENTITY sortByDateCmd.label "Datum">
+<!ENTITY sortByDateCmd.accesskey "u">
 <!ENTITY sortByReceivedCmd.label "Received">
 <!ENTITY sortByReceivedCmd.accesskey "v">
-<!ENTITY sortByStarCmd.label "Star">
-<!ENTITY sortByStarCmd.accesskey "S">
-<!ENTITY sortByAttachmentsCmd.label "Attachments">
+<!ENTITY sortByStarCmd.label "Vlag">
+<!ENTITY sortByStarCmd.accesskey "V">
+<!ENTITY sortByAttachmentsCmd.label "Aanhegsels">
 <!ENTITY sortByAttachmentsCmd.accesskey "A">
-<!ENTITY sortByPriorityCmd.label "Priority">
+<!ENTITY sortByPriorityCmd.label "Prioriteit">
 <!ENTITY sortByPriorityCmd.accesskey "P">
-<!ENTITY sortBySizeCmd.label "Size">
-<!ENTITY sortBySizeCmd.accesskey "z">
+<!ENTITY sortBySizeCmd.label "Grootte">
+<!ENTITY sortBySizeCmd.accesskey "o">
 <!ENTITY sortByStatusCmd.label "Status">
 <!ENTITY sortByStatusCmd.accesskey "u">
-<!ENTITY sortByTagsCmd.label "Tags">
-<!ENTITY sortByTagsCmd.accesskey "g">
-<!ENTITY sortByJunkStatusCmd.label "Junk Status">
-<!ENTITY sortByJunkStatusCmd.accesskey "J">
-<!ENTITY sortBySubjectCmd.label "Subject">
-<!ENTITY sortBySubjectCmd.accesskey "b">
+<!ENTITY sortByTagsCmd.label "Merkers">
+<!ENTITY sortByTagsCmd.accesskey "M">
+<!ENTITY sortByJunkStatusCmd.label "Gemors-status">
+<!ENTITY sortByJunkStatusCmd.accesskey "G">
+<!ENTITY sortBySubjectCmd.label "Onderwerp">
+<!ENTITY sortBySubjectCmd.accesskey "O">
 <!ENTITY sortByFromCmd.label "From">
 <!ENTITY sortByFromCmd.accesskey "F">
-<!ENTITY sortByRecipientCmd.label "Recipient">
-<!ENTITY sortByRecipientCmd.accesskey "c">
-<!ENTITY sortByUnreadCmd.label "Read">
-<!ENTITY sortByUnreadCmd.accesskey "R">
-<!ENTITY sortByOrderReceivedCmd.label "Order Received">
-<!ENTITY sortByOrderReceivedCmd.accesskey "O">
-<!ENTITY sortAscending.label "Ascending">
-<!ENTITY sortAscending.accesskey "A">
-<!ENTITY sortDescending.label "Descending">
-<!ENTITY sortDescending.accesskey "D">
-<!ENTITY sortThreaded.label "Threaded">
-<!ENTITY sortThreaded.accesskey "T">
-<!ENTITY sortUnthreaded.label "Unthreaded">
-<!ENTITY sortUnthreaded.accesskey "h">
-<!ENTITY groupBySort.label "Grouped By Sort">
+<!ENTITY sortByRecipientCmd.label "Ontvanger">
+<!ENTITY sortByRecipientCmd.accesskey "v">
+<!ENTITY sortByUnreadCmd.label "Lees">
+<!ENTITY sortByUnreadCmd.accesskey "L">
+<!ENTITY sortByOrderReceivedCmd.label "Volgorde ontvang">
+<!ENTITY sortByOrderReceivedCmd.accesskey "V">
+<!ENTITY sortAscending.label "Oplopend">
+<!ENTITY sortAscending.accesskey "O">
+<!ENTITY sortDescending.label "Aflopend">
+<!ENTITY sortDescending.accesskey "f">
+<!ENTITY sortThreaded.label "Gedraad">
+<!ENTITY sortThreaded.accesskey "G">
+<!ENTITY sortUnthreaded.label "Ongedraad">
+<!ENTITY sortUnthreaded.accesskey "O">
+<!ENTITY groupBySort.label "Groepeer volgens rangskikking">
 <!ENTITY groupBySort.accesskey "G">
-<!ENTITY msgsMenu.label "Messages">
-<!ENTITY msgsMenu.accesskey "M">
-<!ENTITY threads.label "Threads">
-<!ENTITY threads.accesskey "e">
-<!ENTITY allMsgsCmd.label "All">
+<!ENTITY msgsMenu.label "Boodskappe">
+<!ENTITY msgsMenu.accesskey "B">
+<!ENTITY threads.label "Drade">
+<!ENTITY threads.accesskey "a">
+<!ENTITY allMsgsCmd.label "Almal">
 <!ENTITY allMsgsCmd.accesskey "A">
-<!ENTITY expandAllThreadsCmd.label "Expand All Threads">
-<!ENTITY expandAllThreadsCmd.accesskey "E">
+<!ENTITY expandAllThreadsCmd.label "Vou alle drade uit">
+<!ENTITY expandAllThreadsCmd.accesskey "V">
 <!ENTITY expandAllThreadsCmd.key "*">
-<!ENTITY collapseAllThreadsCmd.label "Collapse All Threads">
-<!ENTITY collapseAllThreadsCmd.accesskey "C">
+<!ENTITY collapseAllThreadsCmd.label "Vou alle drade in">
+<!ENTITY collapseAllThreadsCmd.accesskey "o">
 <!ENTITY collapseAllThreadsCmd.key "\">
-<!ENTITY unreadMsgsCmd.label "Unread">
-<!ENTITY unreadMsgsCmd.accesskey "U">
-<!ENTITY threadsWithUnreadCmd.label "Threads with Unread">
-<!ENTITY threadsWithUnreadCmd.accesskey "T">
-<!ENTITY watchedThreadsWithUnreadCmd.label "Watched Threads with Unread">
-<!ENTITY watchedThreadsWithUnreadCmd.accesskey "W">
-<!ENTITY ignoredThreadsCmd.label "Ignored Threads">
-<!ENTITY ignoredThreadsCmd.accesskey "i">
-<!ENTITY headersMenu.label "Headers">
-<!ENTITY headersMenu.accesskey "H">
-<!ENTITY headersAllCmd.label "All">
+<!ENTITY unreadMsgsCmd.label "Ongelees">
+<!ENTITY unreadMsgsCmd.accesskey "O">
+<!ENTITY threadsWithUnreadCmd.label "Drade met ongelees">
+<!ENTITY threadsWithUnreadCmd.accesskey "D">
+<!ENTITY watchedThreadsWithUnreadCmd.label "Dopgehoude drade met ongelees">
+<!ENTITY watchedThreadsWithUnreadCmd.accesskey "D">
+<!ENTITY ignoredThreadsCmd.label "Geïgnoreerde drade">
+<!ENTITY ignoredThreadsCmd.accesskey "G">
+
+<!ENTITY headersMenu.label "Kopskrifte">
+<!ENTITY headersMenu.accesskey "K">
+<!ENTITY headersAllCmd.label "Almal">
 <!ENTITY headersAllCmd.accesskey "A">
 <!ENTITY headersNormalCmd.label "Normal">
 <!ENTITY headersNormalCmd.accesskey "N">
-<!ENTITY bodyMenu.label "Message Body As">
-<!ENTITY bodyMenu.accesskey "B">
-<!ENTITY bodyAllowHTML.label "Original HTML">
+<!ENTITY bodyMenu.label "Boodskaplyf as">
+<!ENTITY bodyMenu.accesskey "l">
+<!ENTITY bodyAllowHTML.label "Oorspronklike HTML">
 <!ENTITY bodyAllowHTML.accesskey "H">
-<!ENTITY bodySanitized.label "Simple HTML">
-<!ENTITY bodySanitized.accesskey "S">
-<!ENTITY bodyAsPlaintext.label "Plain Text">
-<!ENTITY bodyAsPlaintext.accesskey "P">
-<!ENTITY viewAttachmentsInlineCmd.label "Display Attachments Inline">
-<!ENTITY viewAttachmentsInlineCmd.accesskey "A">
+<!ENTITY bodySanitized.label "Eenvoudige HTML">
+<!ENTITY bodySanitized.accesskey "E">
+<!ENTITY bodyAsPlaintext.label "Skoonteks">
+<!ENTITY bodyAsPlaintext.accesskey "S">
+
+<!ENTITY bodyMenuFeed.label "Feed Message Body As">
+<!ENTITY bodyMenuFeed.accesskey "B">
+<!ENTITY viewFeedWebPage.label "Web Page">
+<!ENTITY viewFeedWebPage.accesskey "W">
+<!ENTITY viewFeedSummary.label "Summary">
+<!ENTITY viewFeedSummary.accesskey "m">
+<!ENTITY viewFeedSummaryFeedPropsPref.label "Default Format">
+<!ENTITY viewFeedSummaryFeedPropsPref.accesskey "D">
+
+<!ENTITY viewAttachmentsInlineCmd.label "Wys aanhegsels inlyn">
+<!ENTITY viewAttachmentsInlineCmd.accesskey "a">
 <!-- LOCALIZATION NOTE :
 fullZoomEnlargeCmd.commandkey3, fullZoomReduceCmd.commandkey2 and
 fullZoomResetCmd.commandkey2 are alternative acceleration keys for zoom.
 If shift key is needed with your locale popular keyboard for them,
 you can use these alternative items. Otherwise, their values should be empty.  -->
 
 
-<!ENTITY fullZoomEnlargeCmd.label "Zoom In">
-<!ENTITY fullZoomEnlargeCmd.accesskey "I">
+<!ENTITY fullZoomEnlargeCmd.label "Zoem in">
+<!ENTITY fullZoomEnlargeCmd.accesskey "i">
 <!ENTITY fullZoomEnlargeCmd.commandkey "+">
 <!-- + is above this key on many keyboards -->
 <!ENTITY fullZoomEnlargeCmd.commandkey2 "=">
 <!ENTITY fullZoomEnlargeCmd.commandkey3 "">
 
-<!ENTITY fullZoomReduceCmd.label "Zoom Out">
-<!ENTITY fullZoomReduceCmd.accesskey "O">
+<!ENTITY fullZoomReduceCmd.label "Zoem uit">
+<!ENTITY fullZoomReduceCmd.accesskey "u">
 <!ENTITY fullZoomReduceCmd.commandkey "-">
 <!ENTITY fullZoomReduceCmd.commandkey2 "">
 
-<!ENTITY fullZoomResetCmd.label "Reset">
-<!ENTITY fullZoomResetCmd.accesskey "R">
+<!ENTITY fullZoomResetCmd.label "Teruglaai">
+<!ENTITY fullZoomResetCmd.accesskey "T">
 <!ENTITY fullZoomResetCmd.commandkey "0">
 <!ENTITY fullZoomResetCmd.commandkey2 "">
 
-<!ENTITY fullZoomToggleCmd.label "Zoom Text Only">
-<!ENTITY fullZoomToggleCmd.accesskey "T">
+<!ENTITY fullZoomToggleCmd.label "Zoem net teks">
+<!ENTITY fullZoomToggleCmd.accesskey "t">
 <!ENTITY fullZoom.label "Zoom">
 <!ENTITY fullZoom.accesskey "Z">
 
-<!ENTITY pageSourceCmd.label "Message Source">
-<!ENTITY pageSourceCmd.accesskey "o">
+<!ENTITY pageSourceCmd.label "Boodskapbron">
+<!ENTITY pageSourceCmd.accesskey "b">
 <!ENTITY pageSourceCmd.key "u">
 <!-- Search Menu -->
 
-<!ENTITY findMenu.label "Find">
-<!ENTITY findMenu.accesskey "F">
+<!ENTITY findMenu.label "Vind">
+<!ENTITY findMenu.accesskey "V">
 <!ENTITY findCmd.label "Find in This Message…">
 <!ENTITY findCmd.accesskey "F">
 <!ENTITY findCmd.key "f">
-<!ENTITY findAgainCmd.label "Find Again">
-<!ENTITY findAgainCmd.accesskey "g">
+<!ENTITY findAgainCmd.label "Vind weer">
+<!ENTITY findAgainCmd.accesskey "e">
 <!ENTITY findAgainCmd.key "g">
 <!ENTITY findAgainCmd.key2 "VK_F3">
 <!ENTITY findPrevCmd.key "g">
 <!ENTITY findPrevCmd.key2 "VK_F3">
 <!ENTITY searchMailCmd.label "Search Messages…">
 <!ENTITY searchMailCmd.accesskey "M">
 <!ENTITY searchMailCmd.key "f">
 <!ENTITY searchAddressesCmd.label "Search Addresses…">
 <!ENTITY searchAddressesCmd.accesskey "S">
 <!-- Go Menu -->
 
-<!ENTITY goMenu.label "Go">
+<!ENTITY goMenu.label "Gaan">
 <!ENTITY goMenu.accesskey "G">
-<!ENTITY nextMenu.label "Next">
-<!ENTITY nextMenu.accesskey "N">
-<!ENTITY nextMsgCmd.label "Message">
-<!ENTITY nextMsgCmd.accesskey "M">
+<!ENTITY nextMenu.label "Volgende">
+<!ENTITY nextMenu.accesskey "n">
+<!ENTITY nextMsgCmd.label "Boodskap">
+<!ENTITY nextMsgCmd.accesskey "o">
 <!ENTITY nextMsgCmd.key "f">
-<!ENTITY nextUnreadMsgCmd.label "Unread Message">
-<!ENTITY nextUnreadMsgCmd.accesskey "U">
+<!ENTITY nextUnreadMsgCmd.label "Ongelese boodskap">
+<!ENTITY nextUnreadMsgCmd.accesskey "O">
 <!ENTITY nextUnreadMsgCmd.key "n">
-<!ENTITY nextStarredMsgCmd.label "Starred Message">
-<!ENTITY nextStarredMsgCmd.accesskey "S">
+<!ENTITY nextStarredMsgCmd.label "Gevlagde boodskap">
+<!ENTITY nextStarredMsgCmd.accesskey "G">
 <!ENTITY nextUnreadThread.label "Unread Thread">
 <!ENTITY nextUnreadThread.accesskey "T">
 <!ENTITY nextUnreadThread.key "t">
-<!ENTITY prevMenu.label "Previous">
-<!ENTITY prevMenu.accesskey "P">
-<!ENTITY prevMsgCmd.label "Message">
-<!ENTITY prevMsgCmd.accesskey "M">
+<!ENTITY prevMenu.label "Vorige">
+<!ENTITY prevMenu.accesskey "V">
+<!ENTITY prevMsgCmd.label "Boodskap">
+<!ENTITY prevMsgCmd.accesskey "o">
 <!ENTITY prevMsgCmd.key "b">
-<!ENTITY prevUnreadMsgCmd.label "Unread Message">
-<!ENTITY prevUnreadMsgCmd.accesskey "U">
+<!ENTITY prevUnreadMsgCmd.label "Ongelese boodskap">
+<!ENTITY prevUnreadMsgCmd.accesskey "O">
 <!ENTITY prevUnreadMsgCmd.key "p">
-<!ENTITY goForwardCmd.label "Forward">
-<!ENTITY goForwardCmd.accesskey "F">
+<!ENTITY goForwardCmd.label "Aanstuur">
+<!ENTITY goForwardCmd.accesskey "A">
 <!ENTITY goForwardCmd.commandKey "]">
-<!ENTITY goBackCmd.label "Back">
-<!ENTITY goBackCmd.accesskey "B">
+<!ENTITY goBackCmd.label "Terug">
+<!ENTITY goBackCmd.accesskey "T">
 <!ENTITY goBackCmd.commandKey "[">
-<!ENTITY prevStarredMsgCmd.label "Starred Message">
-<!ENTITY prevStarredMsgCmd.accesskey "S">
-<!ENTITY startPageCmd.label "Mail Start Page">
-<!ENTITY startPageCmd.accesskey "S">
-<!ENTITY msgMenu.label "Message">
-<!ENTITY msgMenu.accesskey "M">
-<!ENTITY newMsgCmd.label "New Message">
+<!ENTITY prevStarredMsgCmd.label "Gevlagde boodskap">
+<!ENTITY prevStarredMsgCmd.accesskey "G">
+<!ENTITY startPageCmd.label "Posbeginbladsy">
+<!ENTITY startPageCmd.accesskey "b">
+<!-- Message Menu -->
+
+<!ENTITY msgMenu.label "Boodskap">
+<!ENTITY msgMenu.accesskey "o">
+<!ENTITY newMsgCmd.label "Nuwe boodskap">
 <!ENTITY newMsgCmd.accesskey "N">
-<!ENTITY newNewMsgCmd.label "Message">
-<!ENTITY newNewMsgCmd.accesskey "M">
+<!ENTITY newNewMsgCmd.label "Boodskap">
+<!ENTITY newNewMsgCmd.accesskey "o">
 <!ENTITY archiveMsgCmd.label "Archive">
 <!ENTITY archiveMsgCmd.accesskey "A">
 <!ENTITY archiveMsgCmd.key "a">
-<!ENTITY replyMsgCmd.label "Reply">
-<!ENTITY replyMsgCmd.accesskey "R">
+<!ENTITY replyMsgCmd.label "Antwoord">
+<!ENTITY replyMsgCmd.accesskey "A">
 <!ENTITY replyMsgCmd.key "r">
-<!ENTITY replySenderCmd.label "Reply to Sender Only">
-<!ENTITY replySenderCmd.accesskey "R">
-<!ENTITY replyNewsgroupCmd.label "Reply to Newsgroup">
-<!ENTITY replyNewsgroupCmd.accesskey "y">
-<!ENTITY replyToAllMsgCmd.label "Reply to All">
-<!ENTITY replyToAllMsgCmd.accesskey "p">
+<!ENTITY replySenderCmd.label "Antwoord net aan afsender">
+<!ENTITY replySenderCmd.accesskey "A">
+<!ENTITY replyNewsgroupCmd.label "Antwoord aan nuusgroep">
+<!ENTITY replyNewsgroupCmd.accesskey "w">
+<!ENTITY replyToAllMsgCmd.label "Antwoord aan almal">
+<!ENTITY replyToAllMsgCmd.accesskey "n">
 <!ENTITY replyToAllMsgCmd.key "r">
-<!ENTITY forwardMsgCmd.label "Forward">
-<!ENTITY forwardMsgCmd.accesskey "F">
+<!ENTITY replyToListMsgCmd.label "Reply to List">
+<!ENTITY replyToListMsgCmd.accesskey "L">
+<!ENTITY replyToListMsgCmd.key "l">
+<!ENTITY forwardMsgCmd.label "Aanstuur">
+<!ENTITY forwardMsgCmd.accesskey "A">
 <!ENTITY forwardMsgCmd.key "l">
-<!ENTITY forwardAsMenu.label "Forward As">
-<!ENTITY forwardAsMenu.accesskey "w">
-<!ENTITY forwardAsInline.label "Inline">
+<!ENTITY forwardAsMenu.label "Stuur aan as">
+<!ENTITY forwardAsMenu.accesskey "t">
+<!ENTITY forwardAsInline.label "Inlyn">
 <!ENTITY forwardAsInline.accesskey "I">
-<!ENTITY forwardAsAttachmentCmd.label "Attachment">
+<!ENTITY forwardAsAttachmentCmd.label "Aanhegsel">
 <!ENTITY forwardAsAttachmentCmd.accesskey "A">
-<!ENTITY editMsgAsNewCmd.label "Edit Message As New">
-<!ENTITY editMsgAsNewCmd.accesskey "E">
+<!ENTITY editMsgAsNewCmd.label "Redigeer boodskap as nuwe">
+<!ENTITY editMsgAsNewCmd.accesskey "R">
 <!ENTITY editMsgAsNewCmd.key "e">
 <!ENTITY createFilter.label "Create Filter From Message…">
 <!ENTITY createFilter.accesskey "a">
 <!ENTITY moveMsgToMenu.label "Move To">
 <!ENTITY moveMsgToMenu.accesskey "M">
-<!ENTITY moveCopyMsgRecentMenu.label "Recent">
-<!ENTITY moveCopyMsgRecentMenu.accesskey "R">
-<!ENTITY copyMessageLocation.label "Copy Message Location">
-<!ENTITY copyMessageLocation.accesskey "M">
+<!ENTITY moveCopyMsgRecentMenu.label "Onlangs">
+<!ENTITY moveCopyMsgRecentMenu.accesskey "O">
+<!ENTITY copyMessageLocation.label "Kopieer boodskapligging">
+<!ENTITY copyMessageLocation.accesskey "b">
 <!ENTITY copyMsgToMenu.label "Copy To">
 <!ENTITY copyMsgToMenu.accesskey "C">
-<!ENTITY moveToFolderAgain.label "Move Again">
-<!ENTITY moveToFolderAgain.accesskey "i">
+<!ENTITY moveToFolderAgain.label "Verskuif weer">
+<!ENTITY moveToFolderAgain.accesskey "V">
 <!ENTITY moveToFolderAgainCmd.key "m">
-<!ENTITY killThreadMenu.label "Ignore Thread">
+<!ENTITY killThreadMenu.label "Ignoreer draad">
 <!ENTITY killThreadMenu.accesskey "I">
 <!ENTITY killThreadMenu.key "k">
 <!ENTITY killSubthreadMenu.label "Ignore Subthread">
 <!ENTITY killSubthreadMenu.accesskey "S">
 <!ENTITY killSubthreadMenu.key "k">
-<!ENTITY watchThreadMenu.label "Watch Thread">
-<!ENTITY watchThreadMenu.accesskey "W">
+<!ENTITY watchThreadMenu.label "Hou draad dop">
+<!ENTITY watchThreadMenu.accesskey "H">
 <!ENTITY watchThreadMenu.key "w">
-<!ENTITY fileHereMenu.label "File Here">
-<!ENTITY fileHereMenu.accesskey "F">
-<!ENTITY copyHereMenu.label "Copy Here">
-<!ENTITY copyHereMenu.accesskey "C">
-<!ENTITY tagMenu.label "Tag">
-<!ENTITY tagMenu.accesskey "g">
+<!ENTITY fileHereMenu.label "Liasseer hier">
+<!ENTITY fileHereMenu.accesskey "L">
+<!ENTITY copyHereMenu.label "Kopieer hier">
+<!ENTITY copyHereMenu.accesskey "K">
+<!ENTITY tagMenu.label "Merker">
+<!ENTITY tagMenu.accesskey "M">
 <!ENTITY tagCmd0.key "0">
 <!ENTITY tagCmd1.key "1">
 <!ENTITY tagCmd2.key "2">
 <!ENTITY tagCmd3.key "3">
 <!ENTITY tagCmd4.key "4">
 <!ENTITY tagCmd5.key "5">
 <!ENTITY tagCmd6.key "6">
 <!ENTITY tagCmd7.key "7">
 <!ENTITY tagCmd8.key "8">
 <!ENTITY tagCmd9.key "9">
-<!ENTITY markMenu.label "Mark">
+<!ENTITY markMenu.label "Merk">
 <!ENTITY markMenu.accesskey "k">
-<!ENTITY markAsReadCmd.label "As Read">
-<!ENTITY markAsReadCmd.accesskey "R">
+<!ENTITY markAsReadCmd.label "As gelees">
+<!ENTITY markAsReadCmd.accesskey "g">
 <!ENTITY markAsReadCmd.key "m">
-<!ENTITY markThreadAsReadCmd.label "Thread As Read">
-<!ENTITY markThreadAsReadCmd.accesskey "T">
+<!ENTITY markThreadAsReadCmd.label "Draad as gelees">
+<!ENTITY markThreadAsReadCmd.accesskey "D">
 <!ENTITY markThreadAsReadCmd.key "r">
 <!ENTITY markReadByDateCmd.label "As Read by Date…">
 <!ENTITY markReadByDateCmd.accesskey "D">
 <!ENTITY markReadByDateCmd.key "c">
-<!ENTITY markAllReadCmd.label "All Read">
+<!ENTITY markAllReadCmd.label "Alles lees">
 <!ENTITY markAllReadCmd.accesskey "A">
 <!ENTITY markAllReadCmd.key "c">
-<!ENTITY markStarredCmd.label "Add Star">
-<!ENTITY markStarredCmd.accesskey "S">
-<!ENTITY markStarredCmd.key "S">
-<!ENTITY markAsJunkCmd.label "As Junk">
-<!ENTITY markAsJunkCmd.accesskey "J">
+<!ENTITY markStarredCmd.label "Voeg vlag by">
+<!ENTITY markStarredCmd.accesskey "v">
+<!ENTITY markStarredCmd.key "v">
+<!ENTITY markAsJunkCmd.label "As Gemors">
+<!ENTITY markAsJunkCmd.accesskey "G">
 <!ENTITY markAsJunkCmd.key "j">
-<!ENTITY markAsNotJunkCmd.label "As Not Junk">
-<!ENTITY markAsNotJunkCmd.accesskey "N">
+<!ENTITY markAsNotJunkCmd.label "As nie gemors nie">
+<!ENTITY markAsNotJunkCmd.accesskey "n">
 <!ENTITY markAsNotJunkCmd.key "j">
-<!ENTITY recalculateJunkScoreCmd.label "Run Junk Mail Controls">
-<!ENTITY recalculateJunkScoreCmd.accesskey "C">
-<!ENTITY openMessageWindowCmd.label "Open Message">
+<!ENTITY recalculateJunkScoreCmd.label "Laat gemorsposkontrole loop">
+<!ENTITY recalculateJunkScoreCmd.accesskey "k">
+<!ENTITY openMessageWindowCmd.label "Open boodskap">
 <!ENTITY openMessageWindowCmd.accesskey "O">
 <!ENTITY openMessageWindowCmd.key "o">
+<!ENTITY openFeedMessage.label "Open Feed Message">
+<!ENTITY openFeedMessage.accesskey "O">
+<!ENTITY openFeedWebPageInWindow.label "Web Page in New Window">
+<!ENTITY openFeedWebPageInWindow.accesskey "W">
+<!ENTITY openFeedSummaryInWindow.label "Summary in New Window">
+<!ENTITY openFeedSummaryInWindow.accesskey "S">
+<!ENTITY openFeedWebPageInMP.label "Toggle Web Page and Summary in Message Pane">
+<!ENTITY openFeedWebPageInMP.accesskey "T">
 <!-- Windows Menu -->
 
 <!ENTITY windowMenu.label "Window">
 <!-- Tools Menu -->
 
-<!ENTITY tasksMenu.label "Tools">
-<!ENTITY tasksMenu.accesskey "T">
-<!ENTITY addons.label "Add-ons">
-<!ENTITY addons.accesskey "d">
-<!ENTITY activitymanager.label "Activity Manager">
-<!ENTITY activitymanager.accesskey "a">
+<!ENTITY tasksMenu.label "Nutsgoed">
+<!ENTITY tasksMenu.accesskey "u">
 <!ENTITY messengerCmd.label "Mail &amp; Newsgroups">
-<!ENTITY messengerCmd.accesskey "m">
+<!ENTITY messengerCmd.accesskey "N">
 <!ENTITY addressBookCmd.label "Address Book">
-<!ENTITY addressBookCmd.accesskey "a">
-<!ENTITY runJunkControls.label "Run Junk Mail Controls on Folder">
-<!ENTITY runJunkControls.accesskey "u">
-<!ENTITY deleteJunk.label "Delete Mail Marked as Junk in Folder">
-<!ENTITY deleteJunk.accesskey "l">
-<!ENTITY errorConsoleCmd.label "Error Console">
-<!ENTITY errorConsoleCmd.accesskey "n">
+<!ENTITY addressBookCmd.accesskey "B">
+<!ENTITY addressBookCmd.key "B">
+<!ENTITY addons.label "Add-ons">
+<!ENTITY addons.accesskey "A">
+<!ENTITY activitymanager.label "Activity Manager">
+<!ENTITY activitymanager.accesskey "v">
 <!ENTITY filtersCmd.label "Message Filters…">
 <!ENTITY filtersCmd.accesskey "F">
-<!ENTITY filtersApply.label "Run Filters on Folder">
-<!ENTITY filtersApply.accesskey "R">
+<!ENTITY filtersApply.label "Laat loop filters op vouer">
+<!ENTITY filtersApply.accesskey "L">
 <!ENTITY filtersApplyToSelection.label "Run Filters on Selected Messages">
-<!ENTITY filtersApplyToSelection.accesskey "S">
+<!ENTITY filtersApplyToSelection.accesskey "u">
 <!ENTITY filtersApplyToMessage.label "Run Filters on Message">
-<!ENTITY filtersApplyToMessage.accesskey "s">
+<!ENTITY filtersApplyToMessage.accesskey "u">
+<!ENTITY runJunkControls.label "Run Junk Mail Controls on Folder">
+<!ENTITY runJunkControls.accesskey "C">
+<!ENTITY deleteJunk.label "Delete Mail Marked as Junk in Folder">
+<!ENTITY deleteJunk.accesskey "D">
+<!ENTITY importCmd.label "Invoer…">
+<!ENTITY importCmd.accesskey "n">
+<!ENTITY errorConsoleCmd.label "Error Console">
+<!ENTITY errorConsoleCmd.accesskey "E">
+<!ENTITY accountManagerCmd.label "Account Settings…">
+<!ENTITY accountManagerCmd.accesskey "S">
+<!-- LOCALIZATION NOTE (accountManagerCmdUnix.accesskey): belongs to accountManagerCmd.label,
+        which is placed under the Edit menu on Unix systems -->
+<!ENTITY accountManagerCmdUnix.accesskey "R">
 <!-- Mail Toolbar -->
 
-<!ENTITY getMsgButton.label "Get Mail">
-<!ENTITY newMsgButton.label "Write">
-<!ENTITY replyButton.label "Reply">
-<!ENTITY replyAllButton.label "Reply All">
-<!ENTITY forwardButton.label "Forward">
-<!ENTITY fileButton.label "File">
-<!ENTITY nextButton.label "Next">
-<!ENTITY previousButton.label "Previous">
-<!ENTITY backButton1.label "Back">
-<!ENTITY goForwardButton1.label "Forward">
-<!ENTITY deleteButton.label "Delete">
+<!ENTITY getMsgButton.label "Kry pos">
+<!ENTITY newMsgButton.label "Skryf">
+<!ENTITY replyButton.label "Antwoord">
+<!ENTITY replyAllButton.label "Almalantwoord">
+<!ENTITY replyListButton.label "Reply to List">
+<!ENTITY forwardButton.label "Aanstuur">
+<!ENTITY fileButton.label "Lêer">
+<!ENTITY nextButton.label "Volgende">
+<!ENTITY previousButton.label "Vorige">
+<!ENTITY backButton1.label "Terug">
+<!ENTITY goForwardButton1.label "Vorentoe">
+<!ENTITY deleteButton.label "Skrap">
 <!ENTITY undeleteButton.label "Undelete">
-<!ENTITY markButton.label "Mark">
-<!ENTITY printButton.label "Print">
+<!ENTITY markButton.label "Merk">
+<!ENTITY printButton.label "Druk">
 <!ENTITY stopButton.label "Stop">
-<!ENTITY throbberItem.title "Activity Indicator">
-<!ENTITY junkButton.label "Junk">
+<!ENTITY throbberItem.title "Aktiwitietaanwyser">
+<!ENTITY junkButton.label "Gemors">
 <!ENTITY notJunkButton.label "Not Junk">
-<!ENTITY addressBookButton.label "Address Book">
+<!ENTITY addressBookButton.label "Adresboek">
 <!ENTITY glodaSearch.title "Global Search">
-<!ENTITY searchItem.title "Quick Search">
-<!ENTITY mailViewsToolbarItem.title "Mail Views">
-<!ENTITY folderLocationToolbarItem.title "Folder Location">
-<!ENTITY tagButton.label "Tag">
+<!ENTITY searchItem.title "Kitssoektog">
+<!ENTITY mailViewsToolbarItem.title "Posaansigte">
+<!ENTITY folderLocationToolbarItem.title "Vouerligging">
+<!ENTITY tagButton.label "Merker">
 <!ENTITY compactButton.label "Compact">
 <!-- Mail Toolbar Tooltips-->
 
-<!ENTITY advancedButton.tooltip "Advanced message search">
-<!ENTITY getMsgButton.tooltip "Get new messages">
+<!ENTITY advancedButton.tooltip "Gevorderde boodskapsoektog">
+<!ENTITY getMsgButton.tooltip "Kry nuwe boodskappe">
 <!ENTITY getAllNewMsgCmd.label "Get All New Messages">
 <!ENTITY getAllNewMsgCmd.accesskey "G">
 <!ENTITY getAllNewMsgCmd.key "t">
-<!ENTITY newMsgButton.tooltip "Create a new message">
-<!ENTITY replyButton.tooltip "Reply to the message">
-<!ENTITY replyAllButton.tooltip "Reply to sender and all recipients">
-<!ENTITY forwardButton.tooltip "Forward selected message">
-<!ENTITY fileButton.tooltip "File selected message">
-<!ENTITY nextButton.tooltip "Move to the next unread message">
-<!ENTITY previousButton.tooltip "Move to the previous unread message">
-<!ENTITY goForwardButton.tooltip "Go forward one message">
-<!ENTITY goBackButton.tooltip "Go back one message">
-<!ENTITY deleteButton.tooltip "Delete selected message or folder">
+<!ENTITY newMsgButton.tooltip "Skep 'n nuwe boodskap">
+<!ENTITY replyButton.tooltip "Antwoord op die boodskap">
+<!ENTITY replyAllButton.tooltip "Antwoord aan afsender en alle ontvangers">
+<!ENTITY replyListButton.tooltip "Reply to mailing list">
+<!ENTITY forwardButton.tooltip "Stuur gemerkte boodskap aan">
+<!ENTITY fileButton.tooltip "Lêerskiesboodskap">
+<!ENTITY nextButton.tooltip "Gaan na volgende ongelese boodskappe">
+<!ENTITY previousButton.tooltip "Gaan na vorige ongelese boodskappe">
+<!ENTITY goForwardButton.tooltip "Gaan een boodskap vorentoe">
+<!ENTITY goBackButton.tooltip "Gaan een boodskap terug">
+<!ENTITY deleteButton.tooltip "Skrap gemerkte boodskap of vouer">
 <!ENTITY undeleteButton.tooltip "Undelete selected message">
-<!ENTITY markButton.tooltip "Mark messages">
-<!ENTITY printButton.tooltip "Print this message">
-<!ENTITY stopButton.tooltip "Stop the current transfer">
-<!ENTITY junkButton.tooltip "Mark the selected messages as junk">
-<!ENTITY notJunkButton.tooltip "Mark the selected messages as not junk">
-<!ENTITY addressBookButton.tooltip "Go to the address book">
-<!ENTITY tagButton.tooltip "Tag messages">
+<!ENTITY markButton.tooltip "Merk boodskap">
+<!ENTITY printButton.tooltip "Druk hierdie boodskap">
+<!ENTITY stopButton.tooltip "Staak die huidige oordrag">
+<!ENTITY junkButton.tooltip "Merk die gemerkte boodskappe as gemors">
+<!ENTITY notJunkButton.tooltip "Merk die gemerkte boodskappe as nie gemors nie">
+<!ENTITY addressBookButton.tooltip "Gaan na die adresboek">
+<!ENTITY tagButton.tooltip "Merk boodskappe">
 <!ENTITY compactButton.tooltip "Remove deleted messages from selected folder">
 <!-- Tags Menu Popup -->
 
 <!ENTITY addNewTag.label "New Tag…">
 <!ENTITY addNewTag.accesskey "N">
 <!-- Folder Pane -->
 
-<!ENTITY folderColumn.label "Name">
-<!ENTITY folderSizeColumn.label "Size">
+<!ENTITY folderColumn.label "Naam">
+<!ENTITY folderSizeColumn.label "Grootte">
 <!-- Folder Pane Context Menu -->
 
 <!ENTITY folderContextGetMessages.label "Get Messages">
 <!ENTITY folderContextGetMessages.accesskey "G">
 <!ENTITY folderContextOpenNewWindow.label "Open">
 <!ENTITY folderContextOpenNewWindow.accesskey "O">
-<!ENTITY folderContextOpenNewTab.label "Open in New Tab">
-<!ENTITY folderContextOpenNewTab.accesskey "T">
+<!ENTITY folderContextOpenNewTab.label "Open in nuwe oortjie">
+<!ENTITY folderContextOpenNewTab.accesskey "o">
 <!ENTITY folderContextNew.label "New Subfolder…">
 <!ENTITY folderContextNew.accesskey "N">
-<!ENTITY folderContextRename.label "Rename">
-<!ENTITY folderContextRename.accesskey "R">
+<!ENTITY folderContextRename.label "Hernoem">
+<!ENTITY folderContextRename.accesskey "r">
 <!ENTITY folderContextRemove.label "Delete">
 <!ENTITY folderContextRemove.accesskey "D">
-<!ENTITY folderContextCompact.label "Compact">
-<!ENTITY folderContextCompact.accesskey "C">
-<!ENTITY folderContextEmptyTrash.label "Empty Trash">
-<!ENTITY folderContextEmptyTrash.accesskey "y">
+<!ENTITY folderContextCompact.label "Kompakteer">
+<!ENTITY folderContextCompact.accesskey "K">
+<!ENTITY folderContextEmptyTrash.label "Maak snippermandjie leeg">
+<!ENTITY folderContextEmptyTrash.accesskey "M">
 <!ENTITY folderContextEmptyJunk.label "Empty Junk">
 <!ENTITY folderContextEmptyJunk.accesskey "J">
-<!ENTITY folderContextSendUnsentMessages.label "Send Unsent Messages">
-<!ENTITY folderContextSendUnsentMessages.accesskey "d">
-<!ENTITY folderContextUnsubscribe.label "Unsubscribe">
-<!ENTITY folderContextUnsubscribe.accesskey "U">
-<!ENTITY folderContextMarkNewsgroupRead.label "Mark Newsgroup Read">
-<!ENTITY folderContextMarkNewsgroupRead.accesskey "k">
-<!ENTITY folderContextMarkMailFolderRead.label "Mark Folder Read">
-<!ENTITY folderContextMarkMailFolderRead.accesskey "k">
+<!ENTITY folderContextSendUnsentMessages.label "Stuur ongestuurde boodskappe">
+<!ENTITY folderContextSendUnsentMessages.accesskey "u">
+<!ENTITY folderContextUnsubscribe.label "Afteken">
+<!ENTITY folderContextUnsubscribe.accesskey "A">
+<!ENTITY folderContextMarkNewsgroupRead.label "Merk nuusgroep as gelees">
+<!ENTITY folderContextMarkNewsgroupRead.accesskey "r">
+<!ENTITY folderContextMarkMailFolderRead.label "Merk vouer as gelees">
+<!ENTITY folderContextMarkMailFolderRead.accesskey "r">
 <!ENTITY folderContextSubscribe.label "Subscribe…">
 <!ENTITY folderContextSubscribe.accesskey "b">
 <!ENTITY folderContextSearchMessages.label "Search…">
 <!ENTITY folderContextSearchMessages.accesskey "S">
 <!ENTITY folderContextProperties.label "Properties…">
 <!ENTITY folderContextProperties.accesskey "P">
 <!ENTITY folderContextFavoriteFolder.label "Favorite Folder">
 <!ENTITY folderContextFavoriteFolder.accesskey "a">
-<!ENTITY folderContextSettings.label "Settings…">
-<!ENTITY folderContextSettings.accesskey "e">
+<!ENTITY folderContextSettings.label "Opstelling…">
+<!ENTITY folderContextSettings.accesskey "p">
 <!-- Search Bar -->
 
-<!ENTITY SearchNameOrEmail.label "Name or Email contains:">
+<!ENTITY SearchNameOrEmail.label "Naam of e-pos bevat:">
 <!ENTITY SearchNameOrEmail.accesskey "N">
 <!-- Gloda Search Bar -->
 
 <!ENTITY glodaSearchBar.emptyText "Search messages…">
 <!ENTITY glodaSearchBar.facet.label "Search:">
 <!-- LOCALIZATION NOTE (glodaSearchFacet.*) labels specify search constraints.
        "everything" searches over subject, involves, body, and attachments.
        "subject" searches only messages subjects.
        "involves" searches only message to/from/cc/bcc.
        "to" searches only message to/cc.
        "from" searches only message using "from" (the message author).
        "body" searches only message bodies, which does not include message
            attachment names or the content of the attachments.  Message body
            basically means a message part with a content-type of text/*.
     -->
-<!ENTITY glodaSearchFacet.everything.label "Everything">
+<!ENTITY glodaSearchFacet.everything.label "Alles">
 <!ENTITY glodaSearchFacet.subject.label "Subject">
 <!ENTITY glodaSearchFacet.involves.label "Involves (from,to,cc,bcc)">
 <!ENTITY glodaSearchFacet.to.label "To, CC">
 <!ENTITY glodaSearchFacet.from.label "From">
 <!ENTITY glodaSearchFacet.body.label "Message Text">
 <!ENTITY glodaSearchFacet.attachmentNames.label "Attachment Names">
 
 <!ENTITY glodaSearchBar.location.label "Location:">
-<!ENTITY glodaSearchFacet.everywhere.label "All Folders">
+<!ENTITY glodaSearchFacet.everywhere.label "Alle vouers">
 <!ENTITY glodaSearchFacet.folder.label "In a specific folder…">
 <!-- Quick Search Menu Bar -->
 
-<!ENTITY searchSubjectMenu.label "Subject">
+<!ENTITY searchSubjectMenu.label "Onderwerp">
 <!ENTITY searchFromMenu.label "From">
 <!ENTITY searchSubjectOrFromMenu.label "Subject or From">
-<!ENTITY searchRecipient.label "To or Cc">
+<!ENTITY searchRecipient.label "Aan of CC">
 <!ENTITY searchSubjectOrRecipientMenu.label "Subject, To or Cc">
-<!ENTITY searchMessageBody.label "Entire Message">
+<!ENTITY searchMessageBody.label "Hele boodskap">
 <!ENTITY saveAsVirtualFolderMenu.label "Save Search as a Folder…">
 <!-- Thread Pane -->
 
-<!ENTITY threadColumn.label "Thread">
+<!ENTITY threadColumn.label "Draad">
 <!ENTITY fromColumn.label "From">
-<!ENTITY recipientColumn.label "Recipient">
-<!ENTITY subjectColumn.label "Subject">
-<!ENTITY dateColumn.label "Date">
-<!ENTITY priorityColumn.label "Priority">
-<!ENTITY tagsColumn.label "Tag">
-<!ENTITY accountColumn.label "Account">
+<!ENTITY recipientColumn.label "Ontvanger">
+<!ENTITY subjectColumn.label "Onderwerp">
+<!ENTITY dateColumn.label "Datum">
+<!ENTITY priorityColumn.label "Prioriteit">
+<!ENTITY tagsColumn.label "Merker">
+<!ENTITY accountColumn.label "Rekening">
 <!ENTITY statusColumn.label "Status">
-<!ENTITY sizeColumn.label "Size">
-<!ENTITY junkStatusColumn.label "Junk Status">
-<!ENTITY unreadColumn.label "Unread">
-<!ENTITY totalColumn.label "Total">
-<!ENTITY readColumn.label "Read">
+<!ENTITY sizeColumn.label "Grootte">
+<!ENTITY junkStatusColumn.label "Gemors-status">
+<!ENTITY unreadColumn.label "Ongelees">
+<!ENTITY totalColumn.label "Totaal">
+<!ENTITY readColumn.label "Lees">
 <!ENTITY receivedColumn.label "Received">
-<!ENTITY starredColumn.label "Starred">
-<!ENTITY locationColumn.label "Location">
-<!ENTITY idColumn.label "Order Received">
-<!ENTITY attachmentColumn.label "Attachments">
+<!ENTITY starredColumn.label "Gevlag">
+<!ENTITY locationColumn.label "Ligging">
+<!ENTITY idColumn.label "Volgorde ontvang">
+<!ENTITY attachmentColumn.label "Aanhegsels">
 <!-- LOCALIZATION NOTE (glodaWhyColumn.label): explains why a message is
      present in the gloda search results.  The values can be found in
      messenger.properties with a prefix of "glodaSearch_results_why_". -->
 <!ENTITY glodaWhyColumn.label "Why">
+<!-- LOCALIZATION NOTE (glodaScoreColumn.label): provides the numerical
+     score assigned to the message as a result of the search.  The column
+     primarily exists to be sorted by, and its contents will probably have
+     little meaning for most users. -->
+<!ENTITY glodaScoreColumn.label "Score">
 <!-- Thread Pane Tooltips -->
 
-<!ENTITY columnChooser.tooltip "Click to select columns to display">
-<!ENTITY threadColumn.tooltip "Click to display message threads">
+<!ENTITY columnChooser.tooltip "Kliek om kolomme te kies wat vertoon moet word">
+<!ENTITY threadColumn.tooltip "Kliek om die boodskapdrade te vertoon">
 <!ENTITY fromColumn.tooltip "Click to sort by from">
-<!ENTITY recipientColumn.tooltip "Click to sort by recipient">
-<!ENTITY subjectColumn.tooltip "Click to sort by subject">
-<!ENTITY dateColumn.tooltip "Click to sort by date">
-<!ENTITY priorityColumn.tooltip "Click to sort by priority">
-<!ENTITY tagsColumn.tooltip "Click to sort by tags">
-<!ENTITY accountColumn.tooltip "Click to sort by account">
-<!ENTITY statusColumn.tooltip "Click to sort by status">
-<!ENTITY sizeColumn.tooltip "Click to sort by size">
-<!ENTITY junkStatusColumn.tooltip "Click to sort by junk status">
-<!ENTITY unreadColumn.tooltip "Number of unread messages in thread">
-<!ENTITY totalColumn.tooltip "Total number of messages in thread">
-<!ENTITY readColumn.tooltip "Click to sort by read">
+<!ENTITY recipientColumn.tooltip "Kliek om volgens ontvanger te rangskik">
+<!ENTITY subjectColumn.tooltip "Kliek om te volgens onderwerp rangskik">
+<!ENTITY dateColumn.tooltip "Kliek om volgens datum te rangskik">
+<!ENTITY priorityColumn.tooltip "Kliek om volgens prioriteit te rangskik">
+<!ENTITY tagsColumn.tooltip "Kliek om volgens merker te rangskik">
+<!ENTITY accountColumn.tooltip "Kliek om volgens rekening te rangskik">
+<!ENTITY statusColumn.tooltip "Kliek om volgens status te rangskik">
+<!ENTITY sizeColumn.tooltip "Kliek om volgens grootte te rangskik">
+<!ENTITY junkStatusColumn.tooltip "Kliek om volgens gemors-status te rangskik">
+<!ENTITY unreadColumn.tooltip "Getal ongelese boodskappe in draad">
+<!ENTITY totalColumn.tooltip "Totale getal boodskappe in draad">
+<!ENTITY readColumn.tooltip "Kliek om volgens gelees te rangskik">
 <!ENTITY receivedColumn.tooltip "Click to sort by date received">
-<!ENTITY starredColumn.tooltip "Click to sort by star">
-<!ENTITY locationColumn.tooltip "Click to sort by location">
-<!ENTITY idColumn.tooltip "Click to sort by order received">
-<!ENTITY attachmentColumn.tooltip "Click to sort by attachments">
+<!ENTITY starredColumn.tooltip "Kliek om volgens vlag te rangskik">
+<!ENTITY locationColumn.tooltip "Kliek om volgens ligging te rangskik">
+<!ENTITY idColumn.tooltip "Kliek om te rangskik volgens volgorde ontvang">
+<!ENTITY attachmentColumn.tooltip "Klik om volgens aanhegsels te rangskik">
 <!ENTITY glodaWhyColumn.tooltip "Click to sort by why the message is in your search results">
+<!ENTITY glodaScoreColumn.tooltip "Click to sort by the search score">
 <!-- Thread Pane Context Menu -->
 
-<!ENTITY contextOpenNewWindow.label "Open Message in New Window">
-<!ENTITY contextOpenNewWindow.accesskey "W">
-<!ENTITY contextOpenNewTab.label "Open Message in New Tab">
-<!ENTITY contextOpenNewTab.accesskey "T">
+<!ENTITY contextOpenNewWindow.label "Open boodskap in nuwe venster">
+<!ENTITY contextOpenNewWindow.accesskey "v">
+<!ENTITY contextOpenNewTab.label "Open boodskap in nuwe oortjie">
+<!ENTITY contextOpenNewTab.accesskey "o">
 <!ENTITY contextEditAsNew.label "Edit As New…">
 <!ENTITY contextEditAsNew.accesskey "E">
-<!ENTITY contextReplySender.label "Reply to Sender Only">
-<!ENTITY contextReplySender.accesskey "R">
-<!ENTITY contextReplyNewsgroup.label "Reply to Newsgroup">
-<!ENTITY contextReplyNewsgroup.accesskey "y">
-<!ENTITY contextReplyAll.label "Reply to All">
-<!ENTITY contextReplyAll.accesskey "A">
-<!ENTITY contextForward.label "Forward">
-<!ENTITY contextForward.accesskey "F">
-<!ENTITY contextForwardAsAttachment.label "Forward as Attachments">
-<!ENTITY contextForwardAsAttachment.accesskey "o">
+<!ENTITY contextReplySender.label "Antwoord net aan afsender">
+<!ENTITY contextReplySender.accesskey "A">
+<!ENTITY contextReplyNewsgroup.label "Antwoord aan nuusgroep">
+<!ENTITY contextReplyNewsgroup.accesskey "w">
+<!ENTITY contextReplyAll.label "Antwoord almal">
+<!ENTITY contextReplyAll.accesskey "a">
+<!ENTITY contextReplyList.label "Reply to List">
+<!ENTITY contextReplyList.accesskey "L">
+<!ENTITY contextForward.label "Aanstuur">
+<!ENTITY contextForward.accesskey "A">
+<!ENTITY contextForwardAsAttachment.label "Stuur aan as aanhegsels">
+<!ENTITY contextForwardAsAttachment.accesskey "t">
 <!ENTITY contextMoveMsgMenu.label "Move To">
 <!ENTITY contextMoveMsgMenu.accesskey "M">
-<!ENTITY contextMoveCopyMsgRecentMenu.label "Recent">
-<!ENTITY contextMoveCopyMsgRecentMenu.accesskey "R">
+<!ENTITY contextMoveCopyMsgRecentMenu.label "Onlangs">
+<!ENTITY contextMoveCopyMsgRecentMenu.accesskey "O">
 <!ENTITY contextCopyMsgMenu.label "Copy To">
 <!ENTITY contextCopyMsgMenu.accesskey "C">
 <!ENTITY contextSaveAs.label "Save As…">
 <!ENTITY contextSaveAs.accesskey "S">
 <!ENTITY contextPrint.label "Print…">
 <!ENTITY contextPrint.accesskey "P">
-<!ENTITY contextPrintPreview.label "Print Preview">
+<!ENTITY contextPrintPreview.label "Drukvoorskou">
 <!ENTITY contextPrintPreview.accesskey "v">
 <!-- Junk Bar -->
 
-<!ENTITY junkBarMessage1.label "Junk Mail">
+<!ENTITY junkBarMessage1.label "Gemorspos">
 <!ENTITY junkBarButton1.label "Not Junk">
 <!ENTITY junkInfoButton.label "?">
 <!-- Remote Content Bar -->
 
-<!ENTITY remoteContentMessage1.label "To protect your privacy, remote images have been blocked.">
-<!ENTITY loadRemoteContentButton2.label "Display Images Now">
+<!ENTITY remoteContentMessage2.label "To protect your privacy, &brandShortName; has blocked remote content in this message.">
+<!ENTITY loadRemoteContentButton3.label "Show Remote Content">
 <!-- Phishing Bar -->
 
 <!ENTITY phishingBarMessage2.label "This message may be a scam.">
 <!ENTITY removePhishingBarButton1.label "Ignore Warning">
 <!ENTITY reportPhishingError1.label "This message doesn't appear to be a scam.">
 <!-- Message Header Button Box (to show hidden email addresses) -->
 
 <!ENTITY more.label "more">
@@ -670,54 +709,54 @@ you can use these alternative items. Oth
 <!ENTITY AddToAddressBook.label "Add to Address Book…">
 <!ENTITY AddToAddressBook.accesskey "B">
 <!ENTITY AddDirectlyToAddressBook.label "Add to Address Book">
 <!ENTITY AddDirectlyToAddressBook.accesskey "B">
 <!ENTITY EditContact.label "Edit Contact…">
 <!ENTITY EditContact.accesskey "E">
 <!ENTITY ViewContact.label "View Contact">
 <!ENTITY ViewContact.accesskey "V">
-<!ENTITY SendMailTo.label "Compose Mail To">
-<!ENTITY SendMailTo.accesskey "s">
-<!ENTITY CopyEmailAddress.label "Copy Email Address">
-<!ENTITY CopyEmailAddress.accesskey "C">
+<!ENTITY SendMailTo.label "Skryf pos aan">
+<!ENTITY SendMailTo.accesskey "y">
+<!ENTITY CopyEmailAddress.label "Kopieer e-posadres">
+<!ENTITY CopyEmailAddress.accesskey "K">
 <!ENTITY CreateFilterFrom.label "Create Filter From…">
 <!ENTITY CreateFilterFrom.accesskey "F">
 <!ENTITY reportPhishingURL.label "Report Email Scam">
 <!ENTITY reportPhishingURL.accesskey "o">
 <!-- Content Pane Context Menu -->
 
-<!ENTITY saveLinkAsCmd.label "Save Link As…">
-<!ENTITY saveLinkAsCmd.accesskey "k">
-<!ENTITY saveImageAsCmd.label "Save Image As…">
-<!ENTITY saveImageAsCmd.accesskey "v">
-<!ENTITY copyCmd.label "Copy">
-<!ENTITY copyCmd.accesskey "C">
-<!ENTITY selectAllCmd.label "Select All">
-<!ENTITY selectAllCmd.accesskey "A">
-<!ENTITY copyLinkCmd.label "Copy Link Location">
-<!ENTITY copyLinkCmd.accesskey "C">
-<!ENTITY copyImageCmd.label "Copy Image Location">
+<!ENTITY saveLinkAsCmd.label "Stoor skakel as…">
+<!ENTITY saveLinkAsCmd.accesskey "e">
+<!ENTITY saveImageAsCmd.label "Stoor prent as…">
+<!ENTITY saveImageAsCmd.accesskey "o">
+<!ENTITY copyCmd.label "Kopieer">
+<!ENTITY copyCmd.accesskey "K">
+<!ENTITY selectAllCmd.label "Merk alles">
+<!ENTITY selectAllCmd.accesskey "a">
+<!ENTITY copyLinkCmd.label "Kopieer skakelligging">
+<!ENTITY copyLinkCmd.accesskey "K">
+<!ENTITY copyImageCmd.label "Kopieer prentligging">
 <!ENTITY copyImageCmd.accesskey "o">
 <!ENTITY copyEmailCmd.label "Copy Email Address">
 <!ENTITY copyEmailCmd.accesskey "E">
 <!-- Statusbar -->
 
-<!ENTITY statusText.label "Done">
+<!ENTITY statusText.label "Klaar">
 <!--  Mac OS X Window Menu -->
 
-<!ENTITY minimizeWindow.label "Minimize">
+<!ENTITY minimizeWindow.label "Minimeer">
 <!ENTITY minimizeWindow.key "m">
-<!ENTITY bringAllToFront.label "Bring All to Front">
-<!ENTITY zoomWindow.label "Zoom">
+<!ENTITY bringAllToFront.label "Bring alles na vore">
+<!ENTITY zoomWindow.label "Zoem">
 <!-- Mac OS X Application Menu (Cocoa widgets) -->
 
-<!ENTITY preferencesCmdMac.label "Preferences…">
+<!ENTITY preferencesCmdMac.label "Voorkeure…">
 <!ENTITY preferencesCmdMac.commandkey ",">
 <!ENTITY preferencesCmdMac.modifiers "accel">
-<!ENTITY servicesMenuMac.label "Services">
-<!ENTITY hideThisAppCmdMac.label "Hide &brandShortName;">
+<!ENTITY servicesMenuMac.label "Dienste">
+<!ENTITY hideThisAppCmdMac.label "Verskuil &brandShortName;">
 <!ENTITY hideThisAppCmdMac.commandkey "H">
 <!ENTITY hideThisAppCmdMac.modifiers "accel">
-<!ENTITY hideOtherAppsCmdMac.label "Hide Others">
+<!ENTITY hideOtherAppsCmdMac.label "Verskuil ander">
 <!ENTITY hideOtherAppsCmdMac.commandkey "H">
 <!ENTITY hideOtherAppsCmdMac.modifiers "accel,alt">
-<!ENTITY showAllAppsCmdMac.label "Show All">
+<!ENTITY showAllAppsCmdMac.label "Wys alle">
--- a/mail/chrome/messenger/messenger.properties
+++ b/mail/chrome/messenger/messenger.properties
@@ -38,16 +38,18 @@
 
 # The following are used by the messenger application
 #
 removeAccount=Delete Account…
 newFolderMenuItem=Folder…
 newSubfolderMenuItem=Subfolder…
 newFolder=New Folder…
 newSubfolder=New Subfolder…
+markFolderRead=Mark Folder Read;Mark Folders Read
+markNewsgroupRead=Mark Newsgroup Read;Mark Newsgroups Read
 folderProperties=Vouereienskappe
 newTag=New Tag…
 getNextNMessages=Kry volgende %S nuusboodskappe
 advanceNextPrompt=Gaan voort na volgende ongelese boodskappe in %S?
 titleNewsPreHost=aan
 replyToSender=Antwoord aan afsender
 reply=Antwoord
 EMLFiles=Poslêers
@@ -57,18 +59,18 @@ OpenEMLFiles=Open boodskap
 defaultSaveMessageAsFileName=boodskap.eml
 SaveMailAs=Stoor boodskap as
 SaveAttachment=Stoor aanhegsel
 SaveAllAttachments=Stoor alle aanhegsels
 LoadingMessageToPrint=Loading message to print…
 MessageLoaded=Message loaded…
 PrintingMessage=Printing message…
 PrintPreviewMessage=Print Previewing message…
-PrintingCard=Printing card…
-PrintPreviewCard=Print Previewing card…
+PrintingContact=Printing contact…
+PrintPreviewContact=Print Previewing contact…
 PrintingAddrBook=Printing AddressBook…
 PrintPreviewAddrBook=Print Previewing AddressBook…
 PrintingComplete=Klaar.
 PreviewTitle=%S - %S
 LoadingMailMsgForPrint=(Laai inhoud vir drukwerk)
 LoadingMailMsgForPrintPreview=(Laai inhoud vir Drukvoorskou)
 saveAttachmentFailed=Kon nie die aanhegsel stoor nie. Kontroleer u lêernaam en probeer later weer.
 saveMessageFailed=Kon nie die boodskap stoor nie. Kontroleer u lêernaam en probeer later weer.
@@ -87,17 +89,17 @@ autoCompactAllFoldersTitle=Kompakteer vo
 autoCompactAllFolders=Wil u alle plaaslike en aflynvouers kompakteer om skyfspasie te bespaar?
 autoCompactAlwaysAskCheckbox=Always ask me before compacting folders automatically
 compactNowButton=Compact &Now
 
 confirmFolderDeletionForFilter=As u die vouer '%S' skrap, sal dit die geassosieerde filter(s) deaktiveer. Is u seker u wil die vouer skrap?
 alertFilterChanged=Filters wat met hierdie vouer geassosieer word, sal bygewerk word.
 filterDisabled=Die vouer '%S' kon nie gevind word nie, en daarom word filter(s) wat met hierdie vouer geassosieer word, gedeaktiveer. Kontroleer dat die vouer bestaan, en dat filters na 'n geldige teikenvouer wys.
 filterFolderDeniedLocked=Die boodskappe kon nie na vouer '%S' gefilter word nie omdat 'n ander operasie besig is.
-parsingFolderFailed=Kon nie die vouer %S open nie omdat dit deur 'n ander operasie gebruik word. Wag tot daardie operasie afgehandel is en kies dan weer die vouer.
+parsingFolderFailed=Unable to open the folder %S because it is in use by some other operation. Please wait for that operation to finish and then select the folder again. 
 deletingMsgsFailed=Kon nie die boodskappe in vouer %S skrap nie omdat dit deur 'n ander operasie gebruik word. Wag tot daardie operasie afgehandel is en probeer dan weer.
 alertFilterCheckbox=Moenie my weer waarsku nie.
 compactFolderDeniedLock=Die vouer '%S' kan nie gekompakteer word nie omdat 'n ander operasie besig is. Probeer later weer.
 compactFolderWriteFailed=Die vouer '%S' kon nie gekompakteer word nie omdat daar nie tot die vouer geskryf kon word nie. Maak seker dat u genoeg skyfspasie het, en dat u skryftoestemming op die lêerstelsel het, en probeer weer.
 filterFolderWriteFailed=Die boodskappe kon nie na vouer '%S' gefilter word nie omdat daar nie tot die vouer geskryf kon word nie. Maak seker dat u genoeg skyfspasie het, en dat u skryftoestemming op die lêerstelsel het, en probeer weer.
 copyMsgWriteFailed=Die boodskappe kon nie na vouer '%S' verskuif of gekopieer word nie omdat daar nie tot die vouer geskryf kon word nie. Om beskikbare skyfspasie groter te maak, kies Maak snippermandjie leeg op die Lêer-kieslys, en kies dan Kompakteer vouers, en probeer weer.
 cantMoveMsgWOBodyOffline=While working offline, you cannot move or copy messages that were not downloaded for offline use. From the Mail window, open the File menu, choose Offline, then uncheck Work Offline, and then try again.
 operationFailedFolderBusy=Die operasie het misluk omdat 'n ander operasie die vouer gebruik. Wag tot daardie operasie afgehandel is en probeer dan weer.
@@ -108,19 +110,19 @@ verboseFolderFormat=%1$S op %2$S
 filterFolderTruncateFailed=Kon nie die inkassie afknot nadat 'n boodskap na vouer '%1$S' gefilter is nie. U sal moontlik %2$S moet afsluit en INBOX.msf skrap.
 
 mailboxTooLarge=Die vouer %S is vol, en kan nie nog boodskappe hou nie. Om plek vir meer boodskappe te maak, skrap enige ou of ongewenste pos en kompakteer die vouer.
 errorGettingDB=Kon nie die opsomminglêer vir %S open nie. Dalk was daar 'n fout op die skyf, of dalk is die volle pad te lank.
 defaultServerTag=(Verstek)
 
 # Used in message database list view to provide a text value for graphic based cells.
 messageUnread=Ongelees
-messageHasFlag=Gevlag
+messageHasFlag=Starred
 messageHasAttachment=Has Attachment
-messageJunk=Gemors
+messageJunk=Junk
 messageExpanded=Expanded
 messageCollapsed=Collapsed
 
 # Used in the SMTP Account Settings panel when a server value has no properties
 smtpServerList-NotSpecified=<nie gespesifiseer nie>
 smtpServer-ConnectionSecurityType-0=Geen
 smtpServer-ConnectionSecurityType-1=STARTTLS, if available
 smtpServer-ConnectionSecurityType-2=STARTTLS
@@ -167,17 +169,16 @@ inboxFolderName=Inkassie
 trashFolderName=Snippermandjie
 sentFolderName=Gestuur
 draftsFolderName=Onvoltooid
 templatesFolderName=Sjablone
 outboxFolderName=Outbox
 junkFolderName=Gemors
 archivesFolderName=Archives
 
-
 # Error message for special folder deletion on imap accounts
 # LOCALIZATION NOTE (specialFolderDeletionErr): Do not translate "IMAP" in the line below
 specialFolderDeletionErr=Kan nie spesiale vouer %S vir IMAP-rekeninge skrap nie.
 specialFolderDeletionErrTitle=Skrap van spesiale vouer
 
 # "Normal" priority is often blank,
 # depending on the consumers of these strings
 priorityLowest=Laagste
@@ -309,38 +310,41 @@ mailAcctType=Pos
 newsAcctType=Nuus
 
 # LOCALIZATION NOTE(nocachedbodytitle): Do not translate "<TITLE>" or "</TITLE>" in the line below
 nocachedbodytitle=<TITLE>Gaan aanlyn om hierdie boodskap te bekyk</TITLE>\n
 
 # mailWindowOverlay.js
 confirmUnsubscribeTitle=Bevestig aftekening
 confirmUnsubscribeText=Is u seker dat u van %S wil afteken?
+confirmUnsubscribeManyText=Are you sure you want to unsubscribe from these newsgroups?
+feedNoSummaryTitle=No Feed Summary
+feedNoSummaryAlert=This is a news feed in an old format, which does not store the Summary of the news item. Therefore it cannot be displayed.
 
 # msgHdrViewOverlay.js
 openLabel=Open
 openLabelAccesskey=O
 saveLabel=Stoor as…
 saveLabelAccesskey=A
 detachLabel=Detach…
-detachLabelAccesskey=h
+detachLabelAccesskey=D
 deleteLabel=Skrap
 deleteLabelAccesskey=k
 deleteAttachments=Die volgende aanhegsels sal permanent van hierdie boodskap af geskrap word:\n%S\nHierdie aksie kan nie ontdoen word nie. Wil u voortgaan?
 detachAttachments=Die volgende aanhegsels is suksesvol gestoor en sal nou permanent van hierdie boodskap af geskrap word:\n%S\nHierdie aksie kan nie ontdoen word nie. Wil u voortgaan?
 deleteAttachmentFailure=Kon nie die gemerkte aanhegsels skrap nie.
 
 # 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
 
 # Connection Error Messages
-101=Onbekende fout
+101=Unknown Error 
 102=Kon nie aan bediener %S verbind nie.
 103=Kon nie aan bediener %S verbind nie; die verbinding is geweier.
 104=Verbinding aan bediener %S het uitgetel.
 
 recipientSearchCriteria=Onderwerp of ontvanger bevat:
 fromSearchCriteria=Subject or From contains:
 
 # LOCALIZATION NOTE(biffNotification): %1$S is the number of new messages  
@@ -354,17 +358,17 @@ newBiffNotification_messages=%1$S het %2
 # 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 new message from %2$S.
 macBiffNotification_messages=%1$S new messages from %2$S.
 macBiffNotification_messages_extra=%1$S new messages from %2$S and %3$S more.
 # Used to separate names/email addresses in a list.  Note the trailing space ', '
-macBiffNotification_separator=,
+macBiffNotification_separator=, 
 
 # For the Quota tab in the mail folder properties dialog
 quotaUsedFree=%S van %S KB gebruik
 quotaPercentUsed=%S%% vol
 # for quota in main window (commandglue.js)
 percent=%S%%
 quotaTooltip=IMAP quota: %S KB used of %S KB total. Click for details.
 
@@ -414,68 +418,90 @@ errorOpenMessageForMessageIdTitle=Error 
 errorOpenMessageForMessageIdMessage=Message for message-id %S not found
 
 # Warnings to alert users about phishing urls
 confirmPhishingTitle=E-posswendelary-waarskuwing
 #LOCALIZATION NOTE %1$S is the brand name, %2$S is the host name of the url being visited
 confirmPhishingUrl=%1$S dink hierdie boodskap is swendelary! Die skakels in die boodskap probeer dalk webbladsye wat u besoek, na te aap. Is u seker u wil %2$S besoek?
 
 # Check for Updates
+# LOCALIZATION NOTE (updatesItem_*): these are alternative labels for Check for Update item in Help menu.
+# Which one is used depends on Update process state.
 updatesItem_default=Check for Updates…
 updatesItem_defaultFallback=Check for Updates…
+updatesItem_default.accesskey=C
 updatesItem_downloading=Downloading %S…
 updatesItem_downloadingFallback=Downloading Update…
+updatesItem_downloading.accesskey=D
 updatesItem_resume=Resume Downloading %S…
 updatesItem_resumeFallback=Resume Downloading Update…
+updatesItem_resume.accesskey=D
 updatesItem_pending=Apply Downloaded Update Now…
 updatesItem_pendingFallback=Apply Downloaded Update Now…
+updatesItem_pending.accesskey=D
 
 # Folder Pane Header Title Strings
 folderPaneHeader_all=Alle vouers
 folderPaneHeader_unread=Ongelese vouers
 folderPaneHeader_favorite=Gunstling-vouers
 folderPaneHeader_recent=Onlangse vouers
+folderPaneHeader_smart=Smart Folders
+smartAccountName=Smart Folders
 
 # Copy / Move to Folder Again
 #LOCALIZATION NOTE %1$S is the name of the folder we will move to. moveToFolderAgainAccessKey
 # should have the same value as copyToFolderAgainAccessKey as they are the same menu item in the UI
 # moveToFolderAgainAccessKey should also be a letter that occurs before %1$S
 moveToFolderAgain=Skuif weer na "%1$S"
 moveToFolderAgainAccessKey=w
 #LOCALIZATION NOTE %1$S is the name of the folder we will copy to
 # copyToFolderAgainAccessKey
 # should have the same value as moveToFolderAgainAccessKey as they are the same menu item in the UI
 # copyToFolderAgainAccessKey should also be a letter that occurs before %1$S
 copyToFolderAgain=Kopieer weer na "%1$S"
 copyToFolderAgainAccessKey=w
 
-#LOCALIZATION NOTE %1$S is the e-mail address of the person we will allow remote images for
-alwaysLoadRemoteContentForSender1= Always load remote images from %1$S
+#LOCALIZATION NOTE %1$S is the e-mail address of the person we will allow remote content for
+alwaysLoadRemoteContentForSender2= Always load remote content from %1$S 
 
 # Strings for growl notifications on Mac OS X
 growlNotification=New Mail
 
 # mailCommands.js
-emptyJunkTitle=Bevestig
+emptyJunkTitle=Confirm
 emptyJunkMessage=Are you sure you want to permanently delete all messages and subfolders in the Junk folder?
 emptyJunkDontAsk=Don't ask me again.
-emptyTrashTitle=Bevestig
+emptyTrashTitle=Confirm
 emptyTrashMessage=Are you sure you want to permanently delete all messages and subfolders in the Trash folder?
 emptyTrashDontAsk=Don't ask me again.
 
 # junkCommands.js
 junkAnalysisPercentComplete=Junk analysis %S complete
 processingJunkMessages=Processing Junk Messages
 
+# Messenger bootstrapping messages
+fileNotFoundTitle = Lêer nie gevind nie
+#LOCALIZATION NOTE(fileNotFoundMsg): %S is the filename
+fileNotFoundMsg = The file %S does not exist.
+
+fileEmptyTitle = File Empty
+#LOCALIZATION NOTE(fileEmptyMsg): %S is the filename
+fileEmptyMsg = The file %S is empty.
+
 # second person direct object pronoun; used in the collapsed header view if
 # the user is in the To or Cc field of a message
 headerFieldYou=You
 
-# The what's new tab title, shown on version update
-whatsNew=What's New
+# Shown when content tabs are being loaded.
+loadingTab=Laai tans…
+
+applyToCollapsedMsgsTitle=Confirm Delete of Messages in Collapsed Thread(s)
+applyToCollapsedMsgs=Warning - this will delete messages in collapsed thread(s)
+applyToCollapsedAlwaysAskCheckbox=Always ask me before deleting messages in collapsed threads
+applyNowButton=Apply
 
 #LOCALIZATION NOTE (glodaSearch_results_why_*):  These strings populate the
 # glodaWhyColumn when performing a gloda-backed search, explaining why a
 # specific result is present in the search.  Because of how the message grouping
 # mechanism works, this value is both the value in the "Why" column as well as
 # the header for the group (when sorting/grouping on the why column.)  Short
 # strings are preferable so the why column can be understood without taking up
 # too much space.
--- a/mail/chrome/messenger/messengercompose/composeMsgs.properties
+++ b/mail/chrome/messenger/messengercompose/composeMsgs.properties
@@ -108,17 +108,17 @@ 12524=Daar het fout gegaan met die stuur
 
 ## @name NS_MSG_UNABLE_TO_SEND_LATER
 12525=Kon nie u boodskap stoor om dit later te stuur nie.
 
 ## @name NS_ERROR_COMMUNICATIONS_ERROR
 12526=Daar was die volgende kommunikasiefout: %d.  Probeer asseblief weer.
 
 ## @name NS_ERROR_BUT_DONT_SHOW_ALERT
-12527=HIERDIE IS NET 'N PLEKHOUER.  JY IS NIE VERONDERSTEL OM HIERDIE STRING TE KAN SIEN NIE.
+12527=HIERDIE IS NET 'N PLEKHOUER.  U IS NIE VERONDERSTEL OM HIERDIE STRING TE KAN SIEN NIE.
 
 ## @name NS_ERROR_TCP_READ_ERROR
 12528=Daar was 'n netwerkfout by die ontvangs van data.  (Netwerkfout: %s)  Probeer weer koppel.
 
 ## @name NS_ERROR_COULD_NOT_GET_USERS_MAIL_ADDRESS
 12529=Daar het fout gegaan met die stuur van die pos:  die antwoordposadres is ongeldig.  Maak seker dat u e-posadres in die posvoorkeure korrek is, en probeer weer.
 
 ## @name NS_ERROR_MIME_MPART_ATTACHMENT_ERROR
@@ -269,25 +269,30 @@ saveDlogMessage=Boodskap is nie gestuur 
 
 ## generics string
 defaultSubject=(onderwerploos)
 chooseFileToAttach=Heg lêer(s) aan
 
 ##
 windowTitlePrefix=Write:
 
-## String used by the dialog that ask the user to enter a subject
-sendMsgTitle=Stuur boodskap
-subjectDlogMessage=U het nie 'n onderwerp vir hierdie boodskap gespesifiseer nie. As u iets wil skryf, kan u dit nou doen.
+## Strings used by the empty subject dialog
+subjectEmptyTitle=Subject Reminder
+subjectEmptyMessage=Your message doesn't have a subject.
+sendWithEmptySubjectButton=&Send Without Subject
+cancelSendingButton=&Cancel Sending
 
-## String used by the dialog that informs the user about the newsgroup recipient
+## Strings used by the dialog that informs about lack of newsgroup support.
+noNewsgroupSupportTitle=Newsgroups Not Supported
 recipientDlogMessage=Hierdie bediener werk net met e-posontvangers. As u voortgaan, sal die nuusgroepe geïgnoreer word.
 
-#String used by the alert that tells the user an e-mail address is invalid
+## Strings used by the alert that tells the user an e-mail address is invalid.
+addressInvalidTitle=Invalid Recipient Address
 addressInvalid=%1$S is nie 'n geldige e-posadres nie omdat dit nie in die vorm gebruiker@gasheer is nie. U moet dit regmaak voor u die e-pos kan stuur.
+
 ## String used by the dialog that ask the user to attach a web page
 attachPageDlogTitle=Dui asseblief 'n ligging aan om aan te heg
 attachPageDlogMessage=Webbladsy (URL):
 
 ## String used for attachment pretty name, when attachment is a message
 messageAttachmentSafeName=Aangehegde boodskap
 ## String used for attachment pretty name, when attachment is message part
 partAttachmentSafeName=Aangehegde boodskapdeel
@@ -306,24 +311,34 @@ CheckMsg=Moenie my weer vertel nie.
 ## Strings used by prompt when Quitting while in progress
 quitComposeWindowTitle=Stuur tans boodskap
 ## LOCALIZATION NOTE (quitComposeWindowMessage): don't translate \n
 quitComposeWindowMessage2=%1$S is currently in the process of sending a message.\nWould you like to wait until the message has been sent before quitting or quit now?
 quitComposeWindowQuitButtonLabel2=&Quit
 quitComposeWindowWaitButtonLabel2=&Wait
 
 ## Strings used by prompt for Ctrl-Enter check before sending message
-sendMessageCheckWindowTitle=Stuur boodskap
+sendMessageCheckWindowTitle=Send Message
 sendMessageCheckLabel=Is u seker u is gereed om hierdie boodskap te stuur?
 sendMessageCheckSendButtonLabel=Stuur
 
 ## reply header in composeMsg
 ## <author> wrote:
 mailnews.reply_header_authorwrote=%s het geskryf
 mailnews.reply_header_ondate=Op %s
 
 ## reply header in composeMsg
 ## user specified 
 mailnews.reply_header_originalmessage=-------- Oorspronklike boodskap --------
 
 ## Strings used by the rename attachment dialog
 renameAttachmentTitle=Rename Attachment
 renameAttachmentMessage=New attachment name:
+
+## Attachment Reminder
+## LOCALIZATION NOTE (mail.compose.attachment_reminder_keywords): comma separated
+##   words that that should trigger an attachment reminder.
+mail.compose.attachment_reminder_keywords=.doc,.pdf,attachment,attach,attached,attaching,enclosed,CV,cover letter
+attachmentReminderTitle=Attachment Reminder
+attachmentReminderMsg=Did you forget to add an attachment?
+attachmentReminderYesIForgot=Oh, I did!
+attachmentReminderFalseAlarm=No, Send Now
+
--- a/mail/chrome/messenger/messengercompose/messengercompose.dtd
+++ b/mail/chrome/messenger/messengercompose/messengercompose.dtd
@@ -1,81 +1,81 @@
 <!--LOCALIZATION NOTE messengercompose.dtd Main UI for message composition -->
 <!ENTITY msgComposeWindow.title "Write: (no subject)">
 <!-- File Menu -->
 
 <!ENTITY fileMenu.label "Lêer">
-<!ENTITY fileMenu.accesskey "l">
+<!ENTITY fileMenu.accesskey "L">
 <!ENTITY newMenu.label "Nuwe">
 <!ENTITY newMenu.accesskey "N">
 <!ENTITY newMessage.label "Boodskap">
 <!ENTITY newMessage.key "M">
 <!ENTITY newMessageCmd2.key "N">
-<!ENTITY newMessage.accesskey "O">
+<!ENTITY newMessage.accesskey "o">
 <!ENTITY newContact.label "Address Book Contact…">
 <!ENTITY newContact.accesskey "C">
 <!ENTITY attachMenu.label "Aanheg">
 <!ENTITY attachMenu.accesskey "a">
 <!ENTITY attachFileCmd.label "File(s)…">
 <!ENTITY attachFileCmd.accesskey "F">
 <!ENTITY attachPageCmd.label "Web Page…">
 <!ENTITY attachPageCmd.accesskey "W">
 <!--LOCALIZATION NOTE attachVCardCmd.label Don't translate the term 'vCard' -->
 <!ENTITY attachVCardCmd.label "Persoonlike kaart (vCard)">
 <!ENTITY attachVCardCmd.accesskey "P">
 <!ENTITY closeCmd.label "Sluit">
 <!ENTITY closeCmd.key "W">
-<!ENTITY closeCmd.accesskey "s">
+<!ENTITY closeCmd.accesskey "S">
 <!ENTITY saveCmd.label "Stoor">
 <!ENTITY saveCmd.key "S">
-<!ENTITY saveCmd.accesskey "s">
+<!ENTITY saveCmd.accesskey "S">
 <!ENTITY saveAsCmd.label "Stoor as">
-<!ENTITY saveAsCmd.accesskey "A">
+<!ENTITY saveAsCmd.accesskey "a">
 <!ENTITY saveAsFileCmd.label "File…">
 <!ENTITY saveAsFileCmd.accesskey "F">
 <!ENTITY saveAsDraftCmd.label "Onvoltooid">
 <!ENTITY saveAsDraftCmd.accesskey "O">
 <!ENTITY saveAsTemplateCmd.label "Sjabloon">
 <!ENTITY saveAsTemplateCmd.accesskey "S">
 <!ENTITY sendNowCmd.label "Versend nou">
 <!ENTITY sendCmd.keycode "VK_RETURN">
 <!ENTITY sendNowCmd.accesskey "s">
 <!ENTITY sendLaterCmd.label "Versend later">
 <!ENTITY sendLaterCmd.keycode "VK_RETURN">
-<!ENTITY sendLaterCmd.accesskey "L">
+<!ENTITY sendLaterCmd.accesskey "l">
 <!ENTITY printSetupCmd.label "Page Setup…">
 <!ENTITY printSetupCmd.accesskey "u">
 <!ENTITY printCmd.label "Druk…">
 <!ENTITY printCmd.key "P">
 <!ENTITY printCmd.accesskey "D">
 <!-- Edit Menu -->
 
 <!ENTITY editMenu.label "Redigeer">
-<!ENTITY editMenu.accesskey "r">
+<!ENTITY editMenu.accesskey "R">
 <!ENTITY undoCmd.label "Ontdoen">
 <!ENTITY undoCmd.key "Z">
-<!ENTITY undoCmd.accesskey "o">
+<!ENTITY undoCmd.accesskey "O">
 <!ENTITY redoCmd.label "Herdoen">
 <!ENTITY redoCmd.key "Y">
-<!ENTITY redoCmd.accesskey "h">
+<!ENTITY redoCmd.accesskey "H">
 <!ENTITY cutCmd.label "Knip">
 <!ENTITY cutCmd.key "X">
 <!ENTITY cutCmd.accesskey "p">
 <!ENTITY copyCmd.label "Kopieer">
 <!ENTITY copyCmd.key "C">
-<!ENTITY copyCmd.accesskey "k">
+<!ENTITY copyCmd.accesskey "K">
 <!ENTITY pasteCmd.label "Plak">
 <!ENTITY pasteCmd.key "V">
-<!ENTITY pasteCmd.accesskey "p">
+<!ENTITY pasteCmd.accesskey "P">
 <!ENTITY pasteNoFormattingCmd.key "V">
 <!ENTITY editRewrapCmd.label "Heromvou">
 <!ENTITY editRewrapCmd.key "R">
 <!ENTITY editRewrapCmd.accesskey "o">
 <!ENTITY deleteCmd.label "Skrap">
-<!ENTITY deleteCmd.accesskey "s">
+<!ENTITY deleteCmd.accesskey "S">
 <!ENTITY selectAllCmd.label "Merk alles">
 <!ENTITY selectAllCmd.key "A">
 <!ENTITY selectAllCmd.accesskey "a">
 <!ENTITY findCmd.label "Find and Replace…">
 <!ENTITY findCmd.key "F">
 <!ENTITY findCmd.accesskey "F">
 <!ENTITY findAgainCmd.label "Vind weer">
 <!ENTITY findAgainCmd.key "G">
@@ -83,17 +83,17 @@
 <!ENTITY findAgainCmd.key2 "VK_F3">
 <!ENTITY findPrevCmd.label "Vind vorige">
 <!ENTITY findPrevCmd.key "G">
 <!ENTITY findPrevCmd.key2 "VK_F3">
 <!ENTITY findPrevCmd.accesskey "n">
 <!-- View Menu -->
 
 <!ENTITY viewMenu.label "Bekyk">
-<!ENTITY viewMenu.accesskey "b">
+<!ENTITY viewMenu.accesskey "B">
 <!ENTITY viewToolbarsMenuNew.label "Nutsbalke">
 <!ENTITY viewToolbarsMenuNew.accesskey "N">
 <!ENTITY showCompositionToolbarCmd.label "Composition Toolbar">
 <!ENTITY showCompositionToolbarCmd.accesskey "o">
 <!ENTITY showFormattingBarCmd.label "Formatting Bar">
 <!ENTITY showFormattingBarCmd.accesskey "F">
 <!ENTITY showTaskbarCmd.label "Statusbalk">
 <!ENTITY showTaskbarCmd.accesskey "S">
@@ -123,51 +123,51 @@
 <!ENTITY attachVCard.label "Heg persoonlike kaart (vCard) aan">
 <!ENTITY attachVCard.accesskey "v">
 
 <!ENTITY returnReceiptMenu.label "Ontvangsnota">
 <!ENTITY returnReceiptMenu.accesskey "v">
 <!ENTITY dsnMenu.label "Delivery Status Notification">
 <!ENTITY dsnMenu.accesskey "N">
 <!ENTITY outputFormatMenu.label "Formaat">
-<!ENTITY outputFormatMenu.accesskey "f">
+<!ENTITY outputFormatMenu.accesskey "F">
 <!ENTITY autoFormatCmd.label "Outospeur">
-<!ENTITY autoFormatCmd.accesskey "o">
+<!ENTITY autoFormatCmd.accesskey "O">
 <!ENTITY plainTextFormatCmd.label "Net skoonteks">
-<!ENTITY plainTextFormatCmd.accesskey "n">
+<!ENTITY plainTextFormatCmd.accesskey "N">
 <!ENTITY htmlFormatCmd.label "Net rykteks (HTML)">
 <!ENTITY htmlFormatCmd.accesskey "r">
 <!ENTITY bothFormatCmd.label "Skoonteks en rykteks (HTML)">
-<!ENTITY bothFormatCmd.accesskey "l">
+<!ENTITY bothFormatCmd.accesskey "L">
 <!ENTITY priorityMenu.label "Prioriteit">
-<!ENTITY priorityMenu.accesskey "p">
+<!ENTITY priorityMenu.accesskey "P">
 <!ENTITY priorityButton.label "Prioriteit:">
 <!ENTITY lowestPriorityCmd.label "Laagste">
-<!ENTITY lowestPriorityCmd.accesskey "l">
+<!ENTITY lowestPriorityCmd.accesskey "L">
 <!ENTITY lowPriorityCmd.label "Laag">
 <!ENTITY lowPriorityCmd.accesskey "a">
 <!ENTITY normalPriorityCmd.label "Gewoon">
-<!ENTITY normalPriorityCmd.accesskey "g">
+<!ENTITY normalPriorityCmd.accesskey "G">
 <!ENTITY highPriorityCmd.label "Hoog">
 <!ENTITY highPriorityCmd.accesskey "o">
 <!ENTITY highestPriorityCmd.label "Hoogste">
 <!ENTITY highestPriorityCmd.accesskey "H">
 <!ENTITY fileCarbonCopyCmd.label "Stuur 'n afskrif aan">
 <!ENTITY fileCarbonCopyCmd.accesskey "r">
 <!ENTITY fileHereMenu.label "Liasseer hier">
 <!-- Tools Menu -->
 
 <!ENTITY tasksMenu.label "Nutsgoed">
-<!ENTITY tasksMenu.accesskey "U">
+<!ENTITY tasksMenu.accesskey "u">
 <!ENTITY messengerCmd.label "Pos en nuusgroepe">
-<!ENTITY messengerCmd.accesskey "p">
+<!ENTITY messengerCmd.accesskey "P">
 <!ENTITY messengerCmd.commandkey "1">
 <!ENTITY addressBookCmd.label "Adresboek">
-<!ENTITY addressBookCmd.accesskey "a">
-<!ENTITY addressBookCmd.commandkey "2">
+<!ENTITY addressBookCmd.accesskey "A">
+<!ENTITY addressBookCmd.key "B">
 <!ENTITY accountManagerCmd.label "Account Settings…">
 <!ENTITY accountManagerCmd.accesskey "c">
 <!ENTITY accountManagerCmdUnix.accesskey "S">
 <!ENTITY preferencesCmd.label "Opsies…">
 <!ENTITY preferencesCmd.accesskey "O">
 <!ENTITY preferencesCmdUnix.label "Voorkeure">
 <!ENTITY preferencesCmdUnix.accesskey "k">
 <!--  Mac OS X Window Menu -->
@@ -204,17 +204,17 @@
 <!ENTITY ccAddr.label "CC:">
 <!ENTITY bccAddr.label "BCC:">
 <!ENTITY replyAddr.label "Antwoord-aan:">
 <!ENTITY newsgroupsAddr.label "Nuusgroep:">
 <!ENTITY followupAddr.label "Opvolg-aan:">
 <!ENTITY subject.label "Onderwerpreël:">
 <!ENTITY subject.accesskey "O">
 <!ENTITY attachments.label "Aanhangsels:">
-<!ENTITY attachments.accesskey "a">
+<!ENTITY attachments.accesskey "A">
 <!-- Format Toolbar, imported from editorAppShell.xul -->
 
 <!ENTITY SmileButton.tooltip "Voeg gesiggie in">
 <!ENTITY smiley1Cmd.label "Glimlag">
 <!ENTITY smiley2Cmd.label "Frons">
 <!ENTITY smiley3Cmd.label "Knipoog">
 <!ENTITY smiley4Cmd.label "Tong uitsteek">
 <!ENTITY smiley5Cmd.label "Laggend">
@@ -240,26 +240,26 @@
 <!ENTITY undo.accesskey "O">
 <!ENTITY cut.label "Knip">
 <!ENTITY cut.accesskey "p">
 <!ENTITY copy.label "Kopieer">
 <!ENTITY copy.accesskey "K">
 <!ENTITY paste.label "Plak">
 <!ENTITY paste.accesskey "P">
 <!ENTITY pasteQuote.label "Plak as aanhaling">
-<!ENTITY pasteQuote.accesskey "A">
+<!ENTITY pasteQuote.accesskey "a">
 
 <!ENTITY openAttachment.label "Open">
 <!ENTITY openAttachment.accesskey "O">
 <!ENTITY delete.label "Skrap">
 <!ENTITY delete.accesskey "S">
 <!ENTITY renameAttachment.label "Rename…">
 <!ENTITY renameAttachment.accesskey "R">
 <!ENTITY selectAll.label "Merk alles">
-<!ENTITY selectAll.accesskey "A">
+<!ENTITY selectAll.accesskey "a">
 <!ENTITY attachFile.label "Attach File(s)…">
 <!ENTITY attachFile.accesskey "F">
 <!ENTITY attachPage.label "Attach Web Page…">
 <!ENTITY attachPage.accesskey "W">
 <!-- Title for the address picker panel -->
 
 <!ENTITY addressesSidebarTitle.label "Kennisse">
 
--- a/mail/chrome/messenger/migration/migration.properties
+++ b/mail/chrome/messenger/migration/migration.properties
@@ -9,23 +9,23 @@ sourceNameOutlook=Outlook
 # Import Sources
 1_dogbert=Voorkeure
 1_seamonkey=Voorkeure
 
 2_dogbert=Rekeningopstelling
 2_seamonkey=Rekeningopstelling
 2_oexpress=Rekeningopstelling
 2_outlook=Rekeningopstelling
-2_eudora=Rekeningopstelling
+2_eudora=Account Settings
 
 4_dogbert=Adresboeke
 4_seamonkey=Adresboeke
 4_oexpress=Adresboek
 4_outlook=Adresboek
-4_eudora=Adresboeke
+4_eudora=Address Books
 
 8_dogbert=Gemorspos-opleiding
 8_seamonkey=Gemorspos-opleiding
 
 16_dogbert=Gestoorde wagwoorde
 16_seamonkey=Gestoorde wagwoorde
 
 32_dogbert=Ander data
@@ -33,17 +33,17 @@ 32_seamonkey=Ander data
 
 64_dogbert=Nuusgroep-vouers
 64_seamonkey=Nuusgroep-vouers
 
 128_dogbert=Posvouers
 128_seamonkey=Posvouers
 128_oexpress=Posvouers
 128_outlook=Posvouers
-128_eudora=Posvouers
+128_eudora=Mail Folders
 
 256_eudora=Filters
 
 # mailDirName needs to be set to the same value as in 4.x
 # see bug #55449
 mailDirName=Pos
 
 # newsDirName needs to be set to the same value as in 4.x
--- a/mail/chrome/messenger/mime.properties
+++ b/mail/chrome/messenger/mime.properties
@@ -174,17 +174,17 @@ 1039=">hier</A> om die res van die boods
 # default attachment name
 ## @name MIME_MSG_DEFAULT_ATTACHMENT_NAME
 ## @loc 
 # LOCALIZATION NOTE (1040): Do not translate "%s" below.
 # Place the %s where you wish the part number of the attachment to appear
 1040=Deel %s
 
 # default forwarded message prefix
-## @name MIME_FORWARDED_MESSAGE_USER_WROTE
+## @name MIME_FORWARDED_MESSAGE_HTML_USER_WROTE
 ## @loc 
 1041=-------- Oorspronklike boodskap --------
 
 # 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>Nie afgelaai nie</B></FONT><HR>
--- a/mail/chrome/messenger/msgAccountCentral.dtd
+++ b/mail/chrome/messenger/msgAccountCentral.dtd
@@ -11,10 +11,10 @@
 <!ENTITY newAcctLink.label "Skep 'n nuwe rekening">
 
 <!ENTITY advFeaturesSectionHdr.label "Gevorderde kenmerke">
 <!ENTITY searchMsgsLink.label "Deursoek boodskappe">
 <!ENTITY filtersLink.label "Bestuur boodskapfilters">
 <!ENTITY junkSettings.label "Gemorspos-opstelling">
 <!ENTITY offlineLink.label "Aflynopstelling">
 
-<!ENTITY rssSectionHdr.label "RSS-nuus en webjoernale">
-<!ENTITY subscibeRSS.label "Bestuur intekeninge">
+<!ENTITY feedsSectionHdr.label "Voere">
+<!ENTITY subscribeFeeds.label "Bestuur intekeninge">
--- a/mail/chrome/messenger/msgFolderPickerOverlay.dtd
+++ b/mail/chrome/messenger/msgFolderPickerOverlay.dtd
@@ -32,9 +32,9 @@
  and other provisions required by the GPL or the LGPL. If you do not delete
  the provisions above, a recipient may use your version of this file under
  the terms of any one of the MPL, the GPL or the LGPL.
 
  ***** END LICENSE BLOCK ***** -->
 <!-- Labels -->
 
 <!ENTITY newfolderchoosethis.label "kies hierdie vir die ouer">
-<!ENTITY filemessageschoosethis.label "kies hierdie vouer">
+<!ENTITY filemessageschoosethis.label "choose this folder">
--- a/mail/chrome/messenger/msgHdrViewOverlay.dtd
+++ b/mail/chrome/messenger/msgHdrViewOverlay.dtd
@@ -55,29 +55,27 @@
 <!ENTITY inReplyToField2.label "in-reply-to ">
 <!ENTITY originalWebsite2.label "website ">
 
 <!ENTITY editMessageDescription.label "This is a draft message">
 <!ENTITY editMessageButton.label "Edit…">
 <!ENTITY archiveButton.label "archive">
 <!ENTITY hdrReplyButton.label "reply">
 <!ENTITY hdrReplyAllButton.label "reply all">
+<!ENTITY hdrReplyListButton.label "reply list">
 <!ENTITY hdrForwardButton.label "forward">
 <!ENTITY hdrJunkButton.label "junk">
 <!ENTITY trashButton.tooltiptext "delete">
 
 <!ENTITY otherActionsButton.label "other actions">
 <!ENTITY saveAsMenuItem.label "save as…">
 <!ENTITY saveAsMenuItem.accesskey "S">
 <!ENTITY viewSourceMenuItem.label "view source…">
 <!ENTITY viewSourceMenuItem.accesskey "V">
 
-<!ENTITY hideDetailsButton.label "hide details">
-<!ENTITY showDetailsButton.label "show details">
-
 <!ENTITY openAttachmentCmd.label "Open">
 <!ENTITY openAttachmentCmd.accesskey "O">
 <!ENTITY saveAsAttachmentCmd.label "Save As…">
 <!ENTITY saveAsAttachmentCmd.accesskey "A">
 <!ENTITY detachAttachmentCmd.label "Detach…">
 <!ENTITY deleteAttachmentCmd.label "Skrap">
 <!ENTITY saveAllAttachmentsCmd.label "Save All…">
 <!ENTITY saveAllAttachmentsCmd.accesskey "S">
--- a/mail/chrome/messenger/msgViewPickerOverlay.dtd
+++ b/mail/chrome/messenger/msgViewPickerOverlay.dtd
@@ -6,13 +6,13 @@
 <!ENTITY viewAll.accesskey "A">
 <!ENTITY viewUnread.label "Ongelees">
 <!ENTITY viewUnread.accesskey "O">
 <!ENTITY viewNotDeleted.label "Not Deleted">
 <!ENTITY viewNotDeleted.accesskey "D">
 <!ENTITY viewTags.label "Merkers">
 <!ENTITY viewTags.accesskey "M">
 <!ENTITY viewCustomViews.label "Doelmaak aansigte">
-<!ENTITY viewCustomViews.accesskey "A">
+<!ENTITY viewCustomViews.accesskey "a">
 <!ENTITY viewVirtualFolder.label "Save View as a Folder…">
 <!ENTITY viewVirtualFolder.accesskey "S">
 <!ENTITY viewCustomizeView.label "Customize…">
 <!ENTITY viewCustomizeView.accesskey "C">
--- a/mail/chrome/messenger/newFolderDialog.dtd
+++ b/mail/chrome/messenger/newFolderDialog.dtd
@@ -34,15 +34,15 @@
    - the provisions above, a recipient may use your version of this file under
    - the terms of any one of the MPL, the GPL or the LGPL.
    -
    - ***** END LICENSE BLOCK ***** -->
 <!-- Labels -->
    
 <!ENTITY newFolderDialog.title "Nuwe vouer">
 <!ENTITY name.label "Naam:">
-<!ENTITY name.accesskey "n">
+<!ENTITY name.accesskey "N">
 <!ENTITY description.label "Skep as 'n subvouer van:">
-<!ENTITY description.accesskey "s">
+<!ENTITY description.accesskey "S">
 <!ENTITY folderRestriction1.label "Hierdie bediener beperk vouers tot twee spesiale soorte.">
 <!ENTITY folderRestriction2.label "Laat u nuwe vouer toe om dit te bevat:">
 <!ENTITY foldersOnly.label "Net vouers">
 <!ENTITY messagesOnly.label "Net boodskappe">
--- a/mail/chrome/messenger/news.properties
+++ b/mail/chrome/messenger/news.properties
@@ -34,17 +34,17 @@
 # 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 *****
 downloadHeadersTitlePrefix=Laai kopstukke af
 downloadHeadersInfoText=Daar is %S nuwe boodskapkopstukke wat vir hierdie nuusgroep afgelaai moet word.
 htmlNewsErrorTitle=Fout!
 # LOCALIZATION NOTE ( htmlNewsError ): In the following item, translate only "Error!" and "newsgroup server responded:"
-htmlNewsError=<H1>Fout!</H1>Nuusgroepbediener het gereageer:
+htmlNewsError=<H1>Error!</H1>newsgroup server responded: 
 # LOCALIZATION NOTE ( articleExpired ): In the following item, translate only "Perhaps the article has expired"
 articleExpired=<B><P>Dalk het die artikel verval</P></B>
 removeExpiredArtLinkText=Kliek hier om alle vervalde artikels te verwyder
 cancelDisallowed=Dit lyk nie of hierdie boodskap van u af kom nie.  U kan net u eie plasings kanselleer, en nie dié wat deur ander gedoen is nie.
 cancelConfirm=Is u seker u wil hierdie boodskap kanselleer?
 messageCancelled=Boodskap gekanselleer.
 enterUsername=Tik 'n gebruikernaam vir nuusbedienertoegang in:
 enterUsernameTitle=News Server Username Required
@@ -68,17 +68,17 @@ autoUnsubscribeText=Dit lyk nie of die n
 
 # LOCALIZATION NOTE (autoSubscribeText): %1$S is the newsgroup.
 autoSubscribeText=Wil u op %1$S inteken?
 
 # LOCALIZATION NOTE (Error -304): In the following item, don't translate "NNTP"
 # Error - server error
 ## @name NNTP_ERROR_MESSAGE
 ## @loc None
--304='n Nuus- (NNTP) probleem het plaasgevind:
+-304=A News (NNTP) error occurred:  
 
 # Error - newsgroup scan error
 ## @name NNTP_NEWSGROUP_SCAN_ERROR
 ## @loc None
 -305='n Nuusprobleem het plaasgevind.  Die ondersoek na alle nuusgroepe is onvolledig.  Probeer om weer al die nuusgroepe te sien
 
 # Error - NNTP authinfo failure
 ## @name NNTP_AUTH_FAILED
--- a/mail/chrome/messenger/offline.properties
+++ b/mail/chrome/messenger/offline.properties
@@ -4,17 +4,17 @@ downloadMessagesLabel1=Wil u boodskappe 
 downloadMessagesCheckboxLabel1=Vra my altyd wanneer ek aflyn gaan
 
 # Send Messages Prompt
 sendMessagesWindowTitle1=Ongestuurde boodskappe
 sendMessagesLabel2=Do you want to send your unsent messages now?
 sendMessagesCheckboxLabel1=Vra my altyd wanneer ek aanlyn gaan
 
 # GetMessages While Offline Prompt 
-getMessagesOfflineWindowTitle1=Kry boodskappe
+getMessagesOfflineWindowTitle1=Get Messages 
 getMessagesOfflineLabel1=U is tans aflyn. Wil u aanlyn gaan om nuwe boodskappe te kry?
 
 # Send Messages Offline Prompt
 sendMessagesOfflineWindowTitle1=Ongestuurde boodskappe
 sendMessagesOfflineLabel1=U is tans aflyn. Wil u aanlyn gaan om ongestuurde boodskappe te stuur?
 
 offlineTooltip=U is tans aflyn.
 onlineTooltip=U is tans aanlyn.
--- a/mail/chrome/messenger/preferences/advanced.dtd
+++ b/mail/chrome/messenger/preferences/advanced.dtd
@@ -2,95 +2,101 @@
 <!ENTITY itemDisplay.label "Reading &amp; Display">
 <!ENTITY itemUpdate.label "Bywerk">
 <!ENTITY itemNetworking.label "Netwerk- en skyfspasie">
 <!ENTITY itemCertificates.label "Sertifikate">
 <!-- General Settings -->
 
 
 <!ENTITY enableGlodaSearch.label "Enable Global Search and Indexer">
-<!ENTITY enableGlodaSearch.accesskey "i">
-<!ENTITY systemDefaults.label "Stelselverstek">
-<!ENTITY alwaysCheckDefault.label "Kontroleer altyd aan die begin of &brandShortName; die verstek-poskliënt is">
-<!ENTITY alwaysCheckDefault.accesskey "k">
+<!ENTITY enableGlodaSearch.accesskey "E">
+<!ENTITY systemIntegration.label "System Integration">
+<!ENTITY alwaysCheckDefault.label "Always check to see if &brandShortName; is the default mail client on startup">
+<!ENTITY alwaysCheckDefault.accesskey "A">
+<!ENTITY searchIntegration.label "Allow &searchIntegration.engineName; to search messages">
+<!ENTITY searchIntegration.accesskey "S">
 <!ENTITY checkNow.label "Kontroleer nou">
-<!ENTITY checkNow.accesskey "N">
+<!ENTITY checkNow.accesskey "n">
 <!ENTITY configEditDesc.label "Gevorderde opstelling">
 <!ENTITY configEdit.label "Config Editor…">
-<!ENTITY configEdit.accesskey "g">
+<!ENTITY configEdit.accesskey "C">
 <!ENTITY returnReceiptsInfo.label "Bepaal hoe &brandShortName; antwoordstrokies hanteer">
 <!ENTITY showReturnReceipts.label "Return Receipts…">
 <!ENTITY showReturnReceipts.accesskey "R">
 <!-- Display and Reading Settings -->
 
 <!ENTITY reading.caption "Reading">
 <!ENTITY display.caption "Vertoon">
-<!ENTITY showCondensedAddresses.label "Wys net vertoonnaam vir mense in my adresboek">
-<!ENTITY showCondensedAddresses.accesskey "t">
+<!ENTITY showCondensedAddresses.label "Show only display name for people in my address book">
+<!ENTITY showCondensedAddresses.accesskey "S">
 
 <!ENTITY autoMarkAsRead.label "Automatically mark messages as read">
 <!ENTITY autoMarkAsRead.accesskey "A">
 <!ENTITY markAsReadNoDelay.label "Immediately on display">
-<!ENTITY markAsReadNoDelay.accesskey "d">
+<!ENTITY markAsReadNoDelay.accesskey "o">
 <!-- LOCALIZATION NOTE (markAsReadDelay.label): This will concatenate to
      "After displaying for [___] seconds",
      using (markAsReadDelay.label) and a number (secondsLabel.label). -->
 <!ENTITY markAsReadDelay.label "After displaying for">
-<!ENTITY markAsReadDelay.accesskey "e">
+<!ENTITY markAsReadDelay.accesskey "d">
 <!ENTITY secondsLabel.label "sekondes">
 <!ENTITY openMsgIn.label "Open messages in:">
-<!ENTITY reuseExpRadio0.label "'n Nuwe nuwe boodskapvenster">
-<!ENTITY reuseExpRadio0.accesskey "v">
-<!ENTITY reuseExpRadio1.label "'n Bestaande boodskapvenster">
+<!ENTITY openMsgInNewTab.label "A new tab">
+<!ENTITY openMsgInNewTab.accesskey "t">
+<!ENTITY reuseExpRadio0.label "A new message window">
+<!ENTITY reuseExpRadio0.accesskey "n">
+<!ENTITY reuseExpRadio1.label "An existing message window">
 <!ENTITY reuseExpRadio1.accesskey "e">
+<!ENTITY closeMsgWindowOnDelete.label "Close message window on delete">
+<!ENTITY closeMsgWindowOnDelete.accesskey "C">
 <!-- Update -->
 
 <!ENTITY autoCheck.label "Kontroleer outomaties vir bywerkings aan:">
 <!ENTITY enableAppUpdate.label "&brandShortName;">
 <!ENTITY enableAppUpdate.accesskey "h">
-<!ENTITY enableAddonsUpdate.label "Geïnstalleerde byvoegings">
-<!ENTITY enableAddonsUpdate.accesskey "s">
+<!ENTITY enableAddonsUpdate.label "Installed Add-ons">
+<!ENTITY enableAddonsUpdate.accesskey "A">
 <!ENTITY whenUpdatesFound.label "Wanneer bywerkings vir &brandShortName; gevind word,">
-<!ENTITY modeAskMe.label "Vra my wat ek wil doen">
-<!ENTITY modeAskMe.accesskey "r">
-<!ENTITY modeAutomatic.label "Laai die bywerkings outomaties af en installeer dit">
-<!ENTITY modeAutomatic.accesskey "b">
-<!ENTITY modeAutoAddonWarn.label "Waarsku my as dit enige van my byvoegings sal deaktiveer">
+<!ENTITY modeAskMe.label "Ask me what I want to do">
+<!ENTITY modeAskMe.accesskey "m">
+<!ENTITY modeAutomatic.label "Automatically download and install the update">
+<!ENTITY modeAutomatic.accesskey "d">
+<!ENTITY modeAutoAddonWarn.label "Warn me if this will disable any of my add-ons">
 <!ENTITY modeAutoAddonWarn.accesskey "W">
-<!ENTITY showUpdates.label "Wys bywerkingsgeskiedenis">
-<!ENTITY showUpdates.accesskey "b">
+<!ENTITY showUpdates.label "Show Update History">
+<!ENTITY showUpdates.accesskey "S">
 <!-- Networking and Disk Space -->
 
-<!ENTITY showSettings.label "Settings…">
-<!ENTITY showSettings.accesskey "n">
+<!ENTITY showSettings.label "Opstelling…">
+<!ENTITY showSettings.accesskey "O">
 <!ENTITY proxiesConfigure.label "Configure how &brandShortName; connects to the Internet">
 <!ENTITY connectionsInfo.caption "Verbinding">
 <!ENTITY offlineInfo.caption "Aflyn">
 <!ENTITY offlineInfo.label "Stel aflynopstelling op">
 <!ENTITY showOffline.label "Offline…">
 <!ENTITY showOffline.accesskey "O">
 
 <!ENTITY Diskspace "Skyfspasie">
-<!ENTITY offlineCompact.label "Kompakteer vouers wanneer dit meer as soveel sal bespaar">
-<!ENTITY offlineCompact.accesskey "b">
+<!ENTITY offlineCompact.label "Compact folders when it will save over">
+<!ENTITY offlineCompact.accesskey "a">
 <!ENTITY kb.label "KG">
 <!-- LOCALIZATION NOTE:
   The entities useCacheBefore.label and useCacheAfter.label appear on a single
   line in preferences as follows:
 
   &useCacheBefore.label  [ textbox for cache size in MB ]   &useCacheAfter.label;
 -->
 
 <!ENTITY useCacheBefore.label "Gebruik tot">
 <!ENTITY useCacheBefore.accesskey "G">
 <!ENTITY useCacheAfter.label "MB spasie vir die kasgeheue">
 <!ENTITY clearCacheNow.label "Maak nou skoon">
 <!ENTITY clearCacheNow.accesskey "M">
 <!-- Certificates -->
 
-<!ENTITY viewCertificates.label "Bekyk sertifikate">
-<!ENTITY viewCertificates.accesskey "b">
-<!ENTITY viewCRLs.label "Opheffingslyste">
-<!ENTITY viewCRLs.accesskey "o">
-<!ENTITY validation.label "Validation">
-<!ENTITY validation.accesskey "d">
-<!ENTITY viewSecurityDevices.label "Sekuriteitstoestelle">
-<!ENTITY viewSecurityDevices.accesskey "s">
+<!ENTITY viewCertificates.label "View Certificates">
+<!ENTITY viewCertificates.accesskey "C">
+<!ENTITY viewCRLs.label "Revocation Lists">
+<!ENTITY viewCRLs.accesskey "R">
+<!ENTITY validation.label "Stawing">
+<!ENTITY validation.accesskey "S">
+<!ENTITY viewSecurityDevices.label "Security Devices">
+<!ENTITY viewSecurityDevices.accesskey "S">
--- a/mail/chrome/messenger/preferences/compose.dtd
+++ b/mail/chrome/messenger/preferences/compose.dtd
@@ -1,54 +1,57 @@
 <!ENTITY itemGeneral.label "Algemeen">
 <!ENTITY itemAutoComplete.label "Adresbediener">
 <!ENTITY itemSpellCheck.label "Spelling">
 
-<!ENTITY forwardMsg.label "Forward messages:">
-<!ENTITY forwardMsg.accesskey "w">
-<!ENTITY inline.label "Inlyn">
-<!ENTITY inline.accesskey "I">
-<!ENTITY asAttachment.label "As aanhangsel">
-<!ENTITY asAttachment.accesskey "A">
+<!ENTITY forwardMsg.label "Stuur boodskappe aan:">
+<!ENTITY forwardMsg.accesskey "S">
+<!ENTITY inline.label "Inline">
+<!ENTITY asAttachment.label "As Attachment">
 <!ENTITY addExtension.label "add extension to file name">
-<!ENTITY addExtension.accesskey "f">
+<!ENTITY addExtension.accesskey "e">
 
 <!ENTITY htmlComposeHeader.label "HTML">
 <!ENTITY font.label "Font:">
 <!ENTITY font.accesskey "n">
 <!ENTITY size.label "Grootte:">
-<!ENTITY size.accesskey "g">
-<!ENTITY fontColor.label "Tekskleur:">
-<!ENTITY fontColor.accesskey "t">
+<!ENTITY size.accesskey "G">
+<!ENTITY fontColor.label "Text Color:">
+<!ENTITY fontColor.accesskey "T">
 <!ENTITY bgColor.label "Agtergrondkleur:">
 <!ENTITY bgColor.accesskey "A">
 <!ENTITY restoreHTMLDefaults.label "Laai verstek terug">
 <!ENTITY restoreHTMLDefaults.accesskey "L">
 
 <!ENTITY spellCheck.label "Toets spelling voor versending">
-<!ENTITY spellCheck.accesskey "S">
+<!ENTITY spellCheck.accesskey "s">
 <!ENTITY spellCheckInline.label "Gaan spelling na terwyl u tik">
-<!ENTITY spellCheckInline1.accesskey "k">
-<!ENTITY languagePopup.label "Taal:">
-<!ENTITY languagePopup.accessKey "l">
+<!ENTITY spellCheckInline1.accesskey "E">
+<!ENTITY languagePopup.label "Language:">
+<!ENTITY languagePopup.accessKey "L">
 <!ENTITY downloadDictionaries.label "Laai nog woordeboeke af">
 
-<!ENTITY warnOnSendAccelKey.label "Bevestig wanneer snelsleutel gebruik word om boodskap te versend">
-<!ENTITY warnOnSendAccelKey.accesskey "b">
-<!ENTITY autoSave.label "Outostoor elke">
-<!ENTITY autoSave.accesskey "t">
+<!ENTITY warnOnSendAccelKey.label "Confirm when using keyboard shortcut to send message">
+<!ENTITY warnOnSendAccelKey.accesskey "C">
+<!ENTITY autoSave.label "Auto Save every">
+<!ENTITY autoSave.accesskey "A">
 <!ENTITY autoSaveEnd.label "minutes">
 
-<!ENTITY emailCollectionPicker.label "Voeg uitgaande e-posadresse outomaties by:">
-<!ENTITY emailCollectionPicker.accesskey "t">
+<!ENTITY emailCollectionPicker.label "Automatically add outgoing e-mail addresses to my:">
+<!ENTITY emailCollectionPicker.accesskey "A">
 <!ENTITY addressingTitle.label "Adresoutovoltooiing">
 <!ENTITY autocompleteText.label "Wanneer boodskappe geskryf word, soek resultate in:">
-<!ENTITY addressingEnable.label "Plaaslike adresboeke">
-<!ENTITY addressingEnable.accesskey "A">
+<!ENTITY addressingEnable.label "Local Address Books">
+<!ENTITY addressingEnable.accesskey "L">
 <!ENTITY directories.label "Gidsbediener:">
 <!ENTITY directories.accesskey "G">
 <!ENTITY directoriesNone.label "Geen">
 <!ENTITY editDirectories.label "Edit Directories…">
 <!ENTITY editDirectories.accesskey "E">
 
 <!ENTITY sendOptionsDescription.label "Stel teksformaatgedrag op">
 <!ENTITY sendOptions.label "Send Options…">
 <!ENTITY sendOptions.accesskey "S">
+
+<!ENTITY attachmentReminder.label "Check for missing attachments">
+<!ENTITY attachmentReminder.accesskey "m">
+<!ENTITY attachmentReminderOptions.label "Keywords…">
+<!ENTITY attachmentReminderOptions.accesskey "K">
--- a/mail/chrome/messenger/preferences/connection.dtd
+++ b/mail/chrome/messenger/preferences/connection.dtd
@@ -1,37 +1,37 @@
 <!ENTITY connectionsDialog.title "Verbindingopstelling">
 <!ENTITY window.width "37em">
 
 <!ENTITY proxyTitle.label "Stel instaanbedieners op vir internettoegang">
 <!ENTITY noProxyTypeRadio.label "Geen instaanbediener">
-<!ENTITY noProxyTypeRadio.accesskey "g">
+<!ENTITY noProxyTypeRadio.accesskey "G">
 <!ENTITY systemTypeRadio.label "Gebruik stelselinstaaninstellings">
-<!ENTITY systemTypeRadio.accesskey "g">
+<!ENTITY systemTypeRadio.accesskey "G">
 <!ENTITY WPADTypeRadio.label "Outospeur instaanopstelling vir hierdie netwerk">
 <!ENTITY WPADTypeRadio.accesskey "w">
 <!ENTITY manualTypeRadio.label "Handmatige opstelling van instaanbediener:">
-<!ENTITY manualTypeRadio.accesskey "h">
+<!ENTITY manualTypeRadio.accesskey "H">
 <!ENTITY autoTypeRadio.label "URL vir outomatiese opstelling van instaanbediener:">
-<!ENTITY autoTypeRadio.accesskey "O">
+<!ENTITY autoTypeRadio.accesskey "o">
 <!ENTITY reload.label "Herlaai">
 <!ENTITY reload.accesskey "l">
 <!ENTITY http.label "HTTP-instaanbediener:">
-<!ENTITY http.accesskey "h">
+<!ENTITY http.accesskey "H">
 <!ENTITY ssl.label "SSL-instaanbediener:">
-<!ENTITY ssl.accesskey "s">
+<!ENTITY ssl.accesskey "S">
 <!ENTITY socks.label "SOCKS-gasheer:">
-<!ENTITY socks.accesskey "c">
+<!ENTITY socks.accesskey "C">
 <!ENTITY socks4.label "SOCKS v4">
-<!ENTITY socks4.accesskey "k">
+<!ENTITY socks4.accesskey "K">
 <!ENTITY socks5.label "SOCKS v5">
 <!ENTITY socks5.accesskey "v">
 <!ENTITY HTTPport.label "Port:">
 <!ENTITY HTTPport.accesskey "p">
 <!ENTITY SSLport.label "Port:">
 <!ENTITY SSLport.accesskey "o">
 <!ENTITY SOCKSport.label "Port:">
 <!ENTITY SOCKSport.accesskey "t">
 <!ENTITY noproxy.label "Geen instaanbediener vir:">
-<!ENTITY noproxy.accesskey "g">
+<!ENTITY noproxy.accesskey "G">
 <!ENTITY noproxyExplain.label "Byvoorbeeld: .mozilla.org, .org.za, 192.168.1.0/24">
 <!ENTITY shareproxy.label "Gebruik hierdie instaanbediener vir alle protokols">
 <!ENTITY shareproxy.accesskey "i">
--- a/mail/chrome/messenger/preferences/display.dtd
+++ b/mail/chrome/messenger/preferences/display.dtd
@@ -3,46 +3,46 @@
 
 <!ENTITY style.label "Styl:">
 <!ENTITY style.accesskey "y">
 <!ENTITY regularStyle.label "Gewoon">
 <!ENTITY bold.label "Vet">
 <!ENTITY italic.label "Skuins">
 <!ENTITY boldItalic.label "Vet skuinsdruk">
 <!ENTITY size.label "Grootte:">
-<!ENTITY size.accesskey "g">
+<!ENTITY size.accesskey "G">
 <!ENTITY regularSize.label "Gewoon">
 <!ENTITY bigger.label "Groter">
 <!ENTITY smaller.label "Kleiner">
 <!ENTITY color.label "Kleur:">
-<!ENTITY color.accesskey "k">
+<!ENTITY color.accesskey "K">
 <!ENTITY displayWidth.label "Skoonteks-boodskappe">
 <!ENTITY plainText.label "Gebruik die volgende fout:">
 <!ENTITY displayText.label "Wanneer aangehaalde teks in skoonteks boodskappe gewys word:">
 <!ENTITY fixedWidth.label "Vaste monofont">
 <!ENTITY fixedWidth.accesskey "t">
 <!ENTITY variableWidth.label "Veranderlikewydte-font">
 <!ENTITY variableWidth.accesskey "V">
 <!ENTITY colors.label "Kleure">
 <!ENTITY overrideColors.label "Wanneer boodskappe vertoon word, gebruik die volgende kleur:">
 <!ENTITY textColor.label "Tekskleur:">
 <!ENTITY textColor.accesskey "T">
 <!ENTITY backgroundColor.label "Agtergrondkleur:">
-<!ENTITY backgroundColor.accesskey "a">
+<!ENTITY backgroundColor.accesskey "A">
 <!-- LOCALIZATION NOTE : (emoticonsAndStructs.label) 'Emoticons' are also known as 'Smileys', e.g. :-)   -->
 
 <!ENTITY convertEmoticons.label "Wys emotikons as grafika">
 <!ENTITY convertEmoticons.accesskey "W">
 <!-- labels -->
 
 <!ENTITY displayTagsText.label "Merkers kan gebruik word om u boodskappe te kategoriseer en te prioritiseer.">
 <!ENTITY addTagButton.label "Voeg by">
 <!ENTITY addTagButton.accesskey "V">
 <!ENTITY editTagButton.label "Redigeer">
 <!ENTITY editTagButton.accesskey "R">
 <!ENTITY removeTagButton.label "Skrap">
-<!ENTITY removeTagButton.accesskey "s">
+<!ENTITY removeTagButton.accesskey "S">
 <!-- Fonts -->
 
 <!ENTITY fontAndEncodingsDescription.label "Stel die fonts en enkoderings op wat deur &brandShortName; gebruik word">
 <!ENTITY fontsAndEncodingsCaption.label "Fonte en enkoderings">
 <!ENTITY fontOptions.accesskey "F">
 <!ENTITY fontOptions.label "Fonts…">
--- a/mail/chrome/messenger/preferences/fonts.dtd
+++ b/mail/chrome/messenger/preferences/fonts.dtd
@@ -9,21 +9,21 @@
 <!ENTITY sizes.label "Grootte (pixels)">
 <!ENTITY proportionalSize.accesskey "e">
 <!ENTITY monospaceSize.accesskey "x">
 
 <!ENTITY proportional.label "Proporsioneel:">
 <!ENTITY proportional.accesskey "P">
 
 <!ENTITY serif.label "Serif:">
-<!ENTITY serif.accesskey "s">
+<!ENTITY serif.accesskey "S">
 <!ENTITY sans-serif.label "Sans-serif:">
 <!ENTITY sans-serif.accesskey "n">
 <!ENTITY monospace.label "Monospasie:">
-<!ENTITY monospace.accesskey "m">
+<!ENTITY monospace.accesskey "M">
 
 <!ENTITY font.langGroup.latin1 "Westers">
 <!ENTITY font.langGroup.latin2 "Sentraal-Europees">
 <!ENTITY font.langGroup.japanese "Japannees">
 <!ENTITY font.langGroup.trad-chinese "Tradisionele Sjinees (Taiwan)">
 <!ENTITY font.langGroup.simpl-chinese "Vereenvoudigde Sjinees">
 <!ENTITY font.langGroup.trad-chinese-hk "Tradisionele Sjinees (Hongkong)">
 <!ENTITY font.langGroup.korean "Koreaans">
@@ -57,16 +57,16 @@
 <!ENTITY useDefaultFontSerif.label "Serif">
 <!ENTITY useDefaultFontSansSerif.label "Sans Serif">
 
 <!ENTITY useDocumentFonts.label "Laat boodskappe toe om ander fonte te gebruik">
 <!ENTITY useDocumentFonts.accesskey "a">
 <!-- Language settings -->
 
 <!ENTITY sendDefaultCharset.label "Uitgaande pos:">
-<!ENTITY sendDefaultCharset.accesskey "u">
+<!ENTITY sendDefaultCharset.accesskey "U">
 <!ENTITY languagesTitle1.label "Karakterenkodering">
 <!ENTITY composingDescription.label "Stel die verstek-karakterenkodering op vir pos stuur en ontvang">
 
 <!ENTITY viewDefaultCharsetList.label "Inkomende pos:">
 <!ENTITY viewDefaultCharsetList.accesskey "I">
 <!ENTITY replyInDefaultCharset2.label "When possible, use the default character encoding in replies">
 <!ENTITY replyInDefaultCharset2.accesskey "h">
--- a/mail/chrome/messenger/preferences/preferences.dtd
+++ b/mail/chrome/messenger/preferences/preferences.dtd
@@ -1,13 +1,12 @@
-
 <!ENTITY prefWindow.titleWin "Opsies">
 <!ENTITY prefWindow.titleGNOME "&brandShortName;-voorkeure">
 <!ENTITY prefWindow.styleWindows "width: 44em; min-height: 38.5em;">
 <!ENTITY prefWindow.styleMac "width: 47em;">
 <!ENTITY prefWindow.styleGNOME "width: 42em; min-height: 38em;">
 
 <!ENTITY paneGeneral.title "Algemeen">
 <!ENTITY paneDisplay.title "Vertoon">
 <!ENTITY paneComposition.title "Opstelling">
 <!ENTITY paneAttachments.title "Aanhegsels">
-<!ENTITY panePrivacy.title "Privaatheid">
+<!ENTITY paneSecurity.title "Sekuriteit">
 <!ENTITY paneAdvanced.title "Gevorderd">
--- a/mail/chrome/messenger/preferences/preferences.properties
+++ b/mail/chrome/messenger/preferences/preferences.properties
@@ -10,35 +10,46 @@ domainDuplicationError=Die domeinnaam %S
 
 #### Junk
 confirmResetJunkTrainingTitle=Bevestig
 confirmResetJunkTrainingText=Is u seker u wil die aanpassende filteropleidingdata teruglaai?
 
 #### Downloads
 desktopFolderName=Werkskerm
 myDownloadsFolderName=My aflaaie
-chooseDownloadFolderTitle=Kies aflaaivouer:
+chooseAttachmentsFolderTitle=Kies gids
+
+#### Applications
+
+fileEnding=%S-lêer
+saveFile=Stoor lêer
+
+# LOCALIZATION NOTE (useApp, useDefault): %S = Application name
+useApp=Gebruik %S
+useDefault=Gebruik %S (verstek)
 
-#### Download Actions
-extensionNone=(GEEN)
-removeButtonSingle=Verwyder aksie
-removeButtonMultiple=Verwyder aksies
-removeTitleSingle=Verwyder aksie
-removeTitleMultiple=Verwyder aksies
-removeMessageSingle=Die gekose aksie sal sal nie meer uitgevoer word wanneer lêers van die betrokke soort afgelaai word nie. Is u seker dat u hierdie aksie wil verwyder?
-removeMessageMultiple=Die gekose aksies sal nie meer uitgevoer word wanneer lêers van die betrokke soort afgelaai word nie. Is u seker dat u hierdie aksies wil verwyder?
-fileEnding=%S-lêer
-saveToDisk=Stoor na skyf
-openWith=Open met %S
-actionsFiltered=Die volgende aksies pas by u soektog:
-actionsAll=Voer outomaties die geassosieerde aksie uit met elk van die volgende lêersoorte:
+useOtherApp=Gebruik ander…
+fpTitleChooseApp=Kies hulptoepassing
+manageApp=Toepassingdetail…
+alwaysAsk=Vra altyd
 
-#### Change Action
-extensionStringFormat=%S, %S
-fpTitleChooseApp=Kies hulptoepassing
-fpTitleChooseDL=Kies aflaaivouer
+# LOCALIZATION NOTE (usePluginIn):
+# %1$S = plugin name (for example "QuickTime Plugin-in 7.2")
+# %2$S = brandShortName from brand.properties (for example "Shredder")
+usePluginIn=Use %1$S (in %2$S)
+
+# LOCALIZATION NOTE (typeDescriptionWithType):
+# %1$S = type description (for example "Portable Document Format")
+# %2$S = type (for example "application/pdf")
+typeDescriptionWithType=%1$S (%2$S)
 
 #### Sound Notifications
 soundFilePickerTitle=Kies klank
 
 #### Shell Service
 alreadyDefaultClientTitle=Verstek-kliënt
 alreadyDefault=%S is reeds opgestel as u verstekposprogram.
+
+#### Attachment Reminder
+attachmentReminderAddDialogTitle=Add Keyword
+attachmentReminderAddText=Keyword:
+attachmentReminderEditDialogTitle=Redigeer sleutelwoord
+attachmentReminderEditText=Keyword:
--- a/mail/chrome/messenger/preferences/receipts.dtd
+++ b/mail/chrome/messenger/preferences/receipts.dtd
@@ -1,19 +1,19 @@
-<!ENTITY dialog.title "Antwoordstrokies">
+<!ENTITY dialog.title "Return Receipts">
 <!ENTITY requestReceipt.label "Wanneer boodskappe gestuur word, vra altyd 'n antwoordstrokie aan">
 <!ENTITY requestReceipt.accesskey "W">
 <!ENTITY receiptArrive.label "Wanneer 'n strokie aankom:">
 <!ENTITY leaveIt.label "Los dit in my inmandjie">
 <!ENTITY leaveIt.accesskey "i">
 <!ENTITY moveToSent.label "Verskuif dit na my &quot;Gestuur&quot;-vouer">
-<!ENTITY moveToSent.accesskey "v">
+<!ENTITY moveToSent.accesskey "V">
 <!ENTITY requestMDN.label "Wanneer ek 'n versoek om antwoordstrokie ontvang:">
 <!ENTITY never.label "Moet nooit 'n antwoordstrokie stuur nie">
-<!ENTITY never.accesskey "m">
+<!ENTITY never.accesskey "M">
 <!ENTITY returnSome.label "Laat antwoordstrokies toe vir sekere boodskappe">
 <!ENTITY returnSome.accesskey "a">
 <!ENTITY notInToCc.label "As ek nie in die Aan of CC van die boodskap is nie:">
 <!ENTITY notInToCc.accesskey "s">
 <!ENTITY outsideDomain.label "As die afsender van buite my domein is:">
 <!ENTITY outsideDomain.accesskey "d">
 <!ENTITY otherCases.label "In alle ander gevalle:">
 <!ENTITY otherCases.accesskey "a">
--- a/mail/chrome/messenger/prefs.properties
+++ b/mail/chrome/messenger/prefs.properties
@@ -1,11 +1,11 @@
 # The following are used by the Account Wizard
 #
-enterValidEmail=Tik 'n geldige e-posadres in.
+enterValidEmail=Please enter a valid email address.
 accountExists=Daar bestaan reeds 'n pos- of nuusgroeprekening met dieselfde gebruikernaam en bedienernaam. Kliek Terug en tik 'n ander bedienernaam in, of kliek Kanselleer.
 modifiedAccountExists=Daar bestaan reeds 'n rekening met daardie gebruikernaam en bedienernaam. Tik 'n ander gebruikernaam en/of bedienernaam in.
 userNameChanged=U gebruikernaam is bygewer. Dalk moet u ook u e-posadres en/of gebruikernaam wat met hierdie rekening geassosieer word, bywerk.
 serverNameChanged=Die bedienernaam-opstelling het verander. Kontroleer dat enige vouers wat deur filters gebruik word, op die bediener bestaan.
 # if the user chooses to cancel the wizard when no accounts are there throw a message
 # LOCALIZATION NOTE (cancelWizard) 
 # do not localize "\n\n"
 cancelWizard=Is u seker u wil die rekeningslimmerd afsluit?\n\nAs u afsluit, sal enige inligting wat u ingetik het, verlore gaan en die rekening sal nie geskep word nie.
@@ -26,24 +26,24 @@ confirmDeferAccount=As u hierdie rekenin
 confirmDeferAccountTitle=Verwys rekening?
 
 directoryUsedByOtherAccount=This directory is already used by the %S account. Please pick a different directory.
 #Provide default example values for sample email address
 exampleEmailUserName=gebruiker
 exampleEmailDomain=voorbeeld.net
 emailFieldText=E-posadres:
 #LOCALIZATION NOTE: defaultEmailText: %1$S is user name, %2$S is domain
-defaultEmailText=Tik u e-posadres in. Dit is die adres wat mense gebruik wanneer hulle pos vir u stuur (byvoorbeeld, "%1$S@%2$S").
+defaultEmailText=Enter your email address. This is the address others will use to send email to you (for example, "%1$S@%2$S"). 
 #LOCALIZATION NOTE: customizedEmailText: %1$S is provider, %2$S is email username, %3$S is sample email, %4$S is sample username
-customizedEmailText=Tik u %1$S %2$S in (byvoorbeeld, as u %1$S-e-posadres "%3$S" is, is u %2$S "%4$S").
+customizedEmailText=Enter your %1$S %2$S (for example, if your %1$S email address is "%3$S", your %2$S is "%4$S"). 
 
 # account manager stuff
 prefPanel-server=Bedieneropstelling
 prefPanel-copies=Afskrifte en vouers
-prefPanel-syncing-and-diskspace=Syncing & Disk Space
+prefPanel-synchronization=Synchronization & Storage
 prefPanel-diskspace=Skyfspasie
 prefPanel-addressing=Opmaak en adressering
 prefPanel-junk=Gemorspos-opstelling
 ## LOCALIZATION NOTE (prefPanel-smtp): Don't translate "SMTP"
 prefPanel-smtp=Uitgaande bediener (SMTP)
 
 # account manager multiple identity support
 #LOCALIZATION NOTE: accountName: %1$S 
--- a/mail/chrome/messenger/search-attributes.properties
+++ b/mail/chrome/messenger/search-attributes.properties
@@ -1,57 +1,41 @@
 #these need to match nsMsgSearchAttrib interface in nsMsgSearchCore.idl
-0=Onderwerp
-1=Van
-2=Lyf
-3=Datum
-4=Prioriteit
-5=Status
-6=Aan
-7=CC
-8=To or Cc
-# 9 not visible
-9=Ligging
-# 10 not visible
-10=Boodskapsleutel
-11=Ouderdom in dae
-# 12 not visible
-12=Vouerinligting
-13=Size (KB)
-# 14 not visible
-14=AnyText
-15=Merkers
+#and nsMsgSearchAttribMap in nsMsgSearchAdapter.cpp
+Subject=Onderwerp
+From=Van
+Body=Lyf
+Date=Datum
+Priority=Prioriteit
+Status=Status
+To=Aan
+Cc=CC
+ToOrCc=To or Cc
+AgeInDays=Ouderdom in dae
+SizeKB=Size (KB)
+Tags=Merkers
 # for AB and LDAP
-16=Enige naam
-17=Vertoonnaam
-18=Bynaam
-19=Skermnaam
-20=E-pos
-21=Bykomende e-pos
-22=Enige nommer
-23=Telefoon werk
-24=Telefoon tuis
-25=Faks
-26=Roeper
-27=Selfoon
-28=Dorp/stad
-29=Straat
-30=Titel
-31=Organisasie
-32=Afdeling
-33=gereserveer vir AB
-34=gereserveer vir AB
-35=gereserveer vir AB
-36=gereserveer vir AB
-37=gereserveer vir AB
-38=gereserveer vir AB
-39=gereserveer vir AB
-40=gereserveer vir AB
-41=gereserveer vir AB
-42=gereserveer vir AB
-43=gereserveer vir AB
-44=Junk Score Origin
-45=Junk Percent
-46=Aanhegselstatus
-47=Gemors-status
-48=Etiket
-49=Customize…
-# don't use above 49
+AnyName=Enige naam
+DisplayName=Vertoonnaam
+Nickname=Bynaam
+ScreenName=Skermnaam
+Email=E-pos
+AdditionalEmail=Bykomende e-pos
+AnyNumber=Enige nommer
+WorkPhone=Telefoon werk
+HomePhone=Telefoon tuis
+Fax=Faks
+Pager=Roeper
+Mobile=Selfoon
+City=Dorp/stad
+Street=Straat
+Title=Titel
+Organization=Organisasie
+Department=Afdeling
+# more mailnews
+FromToCcOrBcc=From, To, Cc or Bcc
+JunkScoreOrigin=Junk Score Origin
+JunkPercent=Junk Percent
+AttachmentStatus=Aanhegselstatus
+JunkStatus=Gemors-status
+Label=Etiket
+Customize=Customize…
+MissingCustomTerm=Missing Custom Term
--- a/mail/chrome/messenger/search-operators.properties
+++ b/mail/chrome/messenger/search-operators.properties
@@ -17,9 +17,11 @@ 11=klink soos
 12=LdapDwim
 
 13=is groter as
 14=is minder as
 
 15=NameCompletion
 16=is in my adresboek
 17=is nie in my adresboek nie
-
+18=isn't empty
+19=matches
+20=doesn't match
--- a/mail/chrome/messenger/search.properties
+++ b/mail/chrome/messenger/search.properties
@@ -16,8 +16,12 @@ searchSuccessMessages=%S resultate gevin
 searchFailureMessage=Geen resultate gevind nie
 labelForStopButton=Stop
 labelForSearchButton=Soek
 labelForStopButton.accesskey=S
 labelForSearchButton.accesskey=S
 
 moreButtonTooltipText=Voeg 'n nuwe reël by
 lessButtonTooltipText=Verwyder hierdie reël
+
+# LOCALIZATION NOTE (glodaSearchTabTitle): The title to use for global database
+#  search tabs.  Include "%S" where you want the search string to be inserted.
+glodaSearchTabTitle=Search: %S
--- a/mail/chrome/messenger/searchTermOverlay.dtd
+++ b/mail/chrome/messenger/searchTermOverlay.dtd
@@ -1,14 +1,14 @@
 <!ENTITY matchAll.label "Pas al die volgende">
 <!ENTITY matchAll.accesskey "a">
 <!ENTITY matchAny.label "Pas enige van die volgende">
 <!ENTITY matchAny.accesskey "e">
 <!ENTITY matchAllMsgs.label "Pas by alle boodskappe">
-<!ENTITY matchAllMsgs.accesskey "p">
+<!ENTITY matchAllMsgs.accesskey "P">
 <!-- LOCALIZATION NOTE  
   The values below are used to control the widths of the search widgets.
   Change the values only when the localized strings in the popup menus
   are truncated in the widgets.
  -->
 
 <!ENTITY searchTermListAttributesFlexValue "5">
 <!ENTITY searchTermListOperatorsFlexValue "5">
--- a/mail/chrome/messenger/shutdownWindow.properties
+++ b/mail/chrome/messenger/shutdownWindow.properties
@@ -33,11 +33,11 @@
 # 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 *****
 
 
 # These strings are loaded and represented by the XUL dialog.
 shutdownDialogTitle=Shutdown Progress Window
-taskProgress=Processing %1$S of %2$S Tasks
+taskProgress=Processing %1$S of %2$S Tasks 
 
 # These strings are loaded by the individual shutdown tasks.
--- a/mail/chrome/messenger/subscribe.dtd
+++ b/mail/chrome/messenger/subscribe.dtd
@@ -40,16 +40,16 @@
 <!ENTITY subscribeButton.accesskey "I">
 <!ENTITY unsubscribeButton.label "Afteken">
 <!ENTITY unsubscribeButton.accesskey "A">
 <!ENTITY newGroupsTab.label "New Groups">
 <!ENTITY newGroupsTab.accesskey "N">
 <!ENTITY refreshButton.label "Verfris">
 <!ENTITY refreshButton.accesskey "V">
 <!ENTITY stopButton.label "Stop">
-<!ENTITY stopButton.accesskey "T">
+<!ENTITY stopButton.accesskey "t">
 <!ENTITY server.label "Rekening:">
 <!ENTITY server.accesskey "R">
 <!ENTITY subscribedHeader.label "Inteken">
 <!-- commenting out until bug 38906 is fixed 
 <!ENTITY messagesHeader.label         "Messages"> -->
 <!ENTITY namefield.label "Wys items wat dit bevat:">
-<!ENTITY namefield.accesskey "Y">
+<!ENTITY namefield.accesskey "y">
--- a/mail/installer/override.properties
+++ b/mail/installer/override.properties
@@ -76,18 +76,18 @@ ComponentsText=Merk die komponente wat u
 ComponentsSubText2_NoInstTypes=Kies komponente om te installeer:
 DirText=Setup will install $BrandFullNameDA in the following folder. To install in a different folder, click Browse and select another folder. $_CLICK
 DirSubText=Bestemmingsvouer
 DirBrowseText=Select the folder to install $BrandFullNameDA in:
 SpaceAvailable="Spasie beskikbaar: "
 SpaceRequired="Spasie vereis: "
 UninstallingText=$BrandFullNameDA will be uninstalled from the following folder. $_CLICK
 UninstallingSubText=Deïnstalleer uit:
-FileError=Kon nie lêer vir skryf open nie: \r\n\r\n$0\r\n\r\nKliek Staak om die installering te stop,\r\n'Probeer weer' om weer te probeer, of\r\nIgnoreer om hierdie lêer oor te slaan.
-FileError_NoIgnore=Kon nie lêer vir skryf open nie: \r\n\r\n$0\r\n\r\nKliek 'Probeer weer' om weer te probeer, of\r\nKanselleer om die installering te stop.
+FileError=Error opening file for writing: \r\n\r\n$0\r\n\r\nClick Abort to stop the installation,\r\nRetry to try again, or\r\nIgnore to skip this file.
+FileError_NoIgnore=Error opening file for writing: \r\n\r\n$0\r\n\r\nClick Retry to try again, or\r\nCancel to stop the installation.
 CantWrite="Kan nie skryf nie: "
 CopyFailed=Kopiëring het misluk
 CopyTo="Kopieer na "
 Registering="Registreer tans: "
 Unregistering="Deregistreer tans: "
 SymbolNotFound="Kon nie simbool vind nie: "
 CouldNotLoad="Kon nie laai nie: "
 CreateFolder="Skep vouer: "
--- a/mail/updater/updater.ini
+++ b/mail/updater/updater.ini
@@ -1,4 +1,4 @@
 ; This file is in the UTF-8 encoding
 [Strings]
-TitleText=%MOZ_APP_DISPLAYNAME% Update
-InfoText=%MOZ_APP_DISPLAYNAME% is installing your updates and will start in a few moments…
+TitleText=%MOZ_APP_DISPLAYNAME%-bywerking
+InfoText=%MOZ_APP_DISPLAYNAME% installeer tans die bywerkings en sal oor 'n paar sekondes herbegin…