Adding and removing the files as per compare locales for Firefox and Thunderbird. THUNDERBIRD_57_0b1_BUILD1 THUNDERBIRD_57_0b1_BUILD2 THUNDERBIRD_57_0b1_RELEASE THUNDERBIRD_57_0b2_BUILD1 THUNDERBIRD_57_0b2_RELEASE THUNDERBIRD_58_0b1_BUILD1 THUNDERBIRD_58_0b1_BUILD2 THUNDERBIRD_58_0b1_BUILD3 THUNDERBIRD_58_0b1_RELEASE THUNDERBIRD_58_0b2_BUILD1 THUNDERBIRD_58_0b2_RELEASE THUNDERBIRD_58_0b3_BUILD1 THUNDERBIRD_58_0b3_RELEASE THUNDERBIRD_59_0b1_BUILD1 THUNDERBIRD_59_0b1_BUILD2 THUNDERBIRD_59_0b1_RELEASE
authorJamil Ahmed <itsjamil@gmail.com>
Thu, 28 Jul 2011 01:29:53 -0700
changeset 58 c4ae76a06caafd41ff81df85fa8f42b256d0c691
parent 57 79ee72112395cd9d75baae7a73574651a9e50232
child 59 d51849b5a7f4a79c11c3817275a0e5f4d2f5033b
child 722 3ff4d99208acf742ed1460413d6487b70fed4b7f
child 724 cb02bbbc92f371de16756f3b34381f5e75e44ca1
child 730 ba5073cbff31a3d36f924b3516fd5992206dffa4
child 742 39a01612ffec051efaee222a1662f57aa7435692
child 743 04e258508cbb312f8be6f357d7fa548eac6bb21e
child 745 d46c6da481403a73abad1eaa3714b5abc2a157f1
child 757 685419ac4a4d22bb924650df5cb3bbe1f0b11597
child 770 52d0608f913885d335654c2a472ddd2e67f253f8
child 788 756ffa549d412faf5c0ffedc8010a065144969c3
child 793 efb4f24472aad765a08a50e5a5bf9e9b9e572cc8
push idunknown
push userunknown
push dateunknown
Adding and removing the files as per compare locales for Firefox and Thunderbird.
browser/chrome/browser/aboutCertError.dtd
browser/chrome/browser/aboutDialog.dtd
browser/chrome/browser/aboutHome.dtd
browser/chrome/browser/aboutPrivateBrowsing.dtd
browser/chrome/browser/aboutRobots.dtd
browser/chrome/browser/aboutSessionRestore.dtd
browser/chrome/browser/aboutSyncTabs.dtd
browser/chrome/browser/baseMenuOverlay.dtd
browser/chrome/browser/browser.dtd
browser/chrome/browser/browser.properties
browser/chrome/browser/engineManager.dtd
browser/chrome/browser/migration/migration.dtd
browser/chrome/browser/migration/migration.properties
browser/chrome/browser/pageInfo.dtd
browser/chrome/browser/places/editBookmarkOverlay.dtd
browser/chrome/browser/places/moveBookmarks.dtd
browser/chrome/browser/places/places.dtd
browser/chrome/browser/places/places.properties
browser/chrome/browser/preferences/aboutPermissions.dtd
browser/chrome/browser/preferences/aboutPermissions.properties
browser/chrome/browser/preferences/advanced-scripts.dtd
browser/chrome/browser/preferences/advanced.dtd
browser/chrome/browser/preferences/applicationManager.dtd
browser/chrome/browser/preferences/applications.dtd
browser/chrome/browser/preferences/colors.dtd
browser/chrome/browser/preferences/connection.dtd
browser/chrome/browser/preferences/content.dtd
browser/chrome/browser/preferences/cookies.dtd
browser/chrome/browser/preferences/fonts.dtd
browser/chrome/browser/preferences/languages.dtd
browser/chrome/browser/preferences/main.dtd
browser/chrome/browser/preferences/permissions.dtd
browser/chrome/browser/preferences/preferences.dtd
browser/chrome/browser/preferences/privacy.dtd
browser/chrome/browser/preferences/security.dtd
browser/chrome/browser/preferences/sync.dtd
browser/chrome/browser/preferences/tabs.dtd
browser/chrome/browser/safeMode.dtd
browser/chrome/browser/safebrowsing/report-phishing.dtd
browser/chrome/browser/sanitize.dtd
browser/chrome/browser/scratchpad.dtd
browser/chrome/browser/scratchpad.properties
browser/chrome/browser/searchbar.dtd
browser/chrome/browser/setDesktopBackground.dtd
browser/chrome/browser/sidebar/sidebar.properties
browser/chrome/browser/syncBrand.dtd
browser/chrome/browser/syncGenericChange.properties
browser/chrome/browser/syncKey.dtd
browser/chrome/browser/syncQuota.dtd
browser/chrome/browser/syncSetup.dtd
browser/chrome/browser/syncSetup.properties
browser/chrome/browser/tabbrowser.dtd
browser/chrome/overrides/settingsChange.dtd
browser/feedback/main.dtd
browser/installer/custom.properties
dom/chrome/dom/dom.properties
dom/chrome/layout/css.properties
editor/ui/chrome/composer/editor.dtd
editor/ui/chrome/composer/editor.properties
editor/ui/chrome/composer/editorOverlay.dtd
editor/ui/chrome/composer/pref-composer.dtd
editor/ui/chrome/composer/pref-editing.dtd
editor/ui/chrome/composer/pref-toolbars.dtd
editor/ui/chrome/dialogs/EdAdvancedEdit.dtd
editor/ui/chrome/dialogs/EdConvertToTable.dtd
editor/ui/chrome/dialogs/EdLinkChecker.dtd
editor/ui/chrome/dialogs/EditorImageMapHotSpot.dtd
editor/ui/chrome/dialogs/EditorInsertTOC.dtd
editor/ui/chrome/dialogs/EditorPublish.dtd
editor/ui/chrome/dialogs/EditorPublishProgress.dtd
editor/ui/chrome/dialogs/EditorTableProperties.dtd
mail/chrome/communicator/utilityOverlay.dtd
mail/chrome/messenger-newsblog/feed-properties.dtd
mail/chrome/messenger-newsblog/feed-subscriptions.dtd
mail/chrome/messenger/FilterEditor.dtd
mail/chrome/messenger/SearchDialog.dtd
mail/chrome/messenger/aboutDialog.dtd
mail/chrome/messenger/aboutRights.dtd
mail/chrome/messenger/aboutSupportMail.dtd
mail/chrome/messenger/accountCreation.dtd
mail/chrome/messenger/accountCreation.properties
mail/chrome/messenger/activity.dtd
mail/chrome/messenger/addressbook/abAddressBookNameDialog.dtd
mail/chrome/messenger/addressbook/abCardOverlay.dtd
mail/chrome/messenger/addressbook/abCardViewOverlay.dtd
mail/chrome/messenger/addressbook/abContactsPanel.dtd
mail/chrome/messenger/addressbook/abDirTreeOverlay.dtd
mail/chrome/messenger/addressbook/abMailListDialog.dtd
mail/chrome/messenger/addressbook/abMainWindow.dtd
mail/chrome/messenger/addressbook/abNewCardDialog.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/am-addressing.dtd
mail/chrome/messenger/am-advanced.dtd
mail/chrome/messenger/am-archiveoptions.dtd
mail/chrome/messenger/am-copies.dtd
mail/chrome/messenger/am-identities-list.dtd
mail/chrome/messenger/am-identity-edit.dtd
mail/chrome/messenger/am-mdn.dtd
mail/chrome/messenger/am-offline.dtd
mail/chrome/messenger/baseMenuOverlay.dtd
mail/chrome/messenger/credits.dtd
mail/chrome/messenger/downloadheaders.dtd
mail/chrome/messenger/editContactOverlay.dtd
mail/chrome/messenger/featureConfigurator.dtd
mail/chrome/messenger/folderProps.dtd
mail/chrome/messenger/folderpane.dtd
mail/chrome/messenger/importDialog.dtd
mail/chrome/messenger/junkMailInfo.dtd
mail/chrome/messenger/mailEditorOverlay.dtd
mail/chrome/messenger/mailOverlay.dtd
mail/chrome/messenger/messenger.dtd
mail/chrome/messenger/messenger.properties
mail/chrome/messenger/messengercompose/addressingWidgetOverlay.dtd
mail/chrome/messenger/messengercompose/composeMsgs.properties
mail/chrome/messenger/messengercompose/mailComposeEditorOverlay.dtd
mail/chrome/messenger/messengercompose/messengercompose.dtd
mail/chrome/messenger/migration/migration.dtd
mail/chrome/messenger/mime.properties
mail/chrome/messenger/mimeheader.properties
mail/chrome/messenger/msgAccountCentral.dtd
mail/chrome/messenger/msgFolderPickerOverlay.dtd
mail/chrome/messenger/msgHdrViewOverlay.dtd
mail/chrome/messenger/multimessageview.dtd
mail/chrome/messenger/newFolderDialog.dtd
mail/chrome/messenger/newTagDialog.dtd
mail/chrome/messenger/preferences/advanced.dtd
mail/chrome/messenger/preferences/applicationManager.dtd
mail/chrome/messenger/preferences/applications.dtd
mail/chrome/messenger/preferences/attachmentReminder.dtd
mail/chrome/messenger/preferences/compose.dtd
mail/chrome/messenger/preferences/connection.dtd
mail/chrome/messenger/preferences/cookies.dtd
mail/chrome/messenger/preferences/display.dtd
mail/chrome/messenger/preferences/fonts.dtd
mail/chrome/messenger/preferences/general.dtd
mail/chrome/messenger/preferences/notifications.dtd
mail/chrome/messenger/preferences/permissions.dtd
mail/chrome/messenger/preferences/preferences.dtd
mail/chrome/messenger/preferences/receipts.dtd
mail/chrome/messenger/preferences/security.dtd
mail/chrome/messenger/preferences/sendoptions.dtd
mail/chrome/messenger/renameFolderDialog.dtd
mail/chrome/messenger/safeMode.dtd
mail/chrome/messenger/searchTermOverlay.dtd
mail/chrome/messenger/subscribe.dtd
mail/chrome/messenger/systemIntegrationDialog.dtd
mail/chrome/messenger/tabmail.dtd
mail/chrome/messenger/taskbar.properties
mail/chrome/messenger/vcard.properties
mail/chrome/messenger/virtualFolderListDialog.dtd
mail/chrome/messenger/virtualFolderProperties.dtd
mail/chrome/overrides/netError.dtd
mail/chrome/overrides/settingsChange.dtd
netwerk/necko.properties
other-licenses/branding/firefox/brand.dtd
other-licenses/branding/firefox/brand.properties
other-licenses/branding/thunderbird/brand.dtd
security/manager/chrome/pippki/certManager.dtd
security/manager/chrome/pippki/deviceManager.dtd
security/manager/chrome/pippki/pippki.dtd
security/manager/chrome/pippki/validation.dtd
services/sync/errors.properties
toolkit/chrome/cookie/cookieAcceptDialog.dtd
toolkit/chrome/global/about.dtd
toolkit/chrome/global/aboutAbout.dtd
toolkit/chrome/global/aboutRights.dtd
toolkit/chrome/global/aboutSupport.properties
toolkit/chrome/global/appPicker.dtd
toolkit/chrome/global/charsetOverlay.dtd
toolkit/chrome/global/commonDialog.dtd
toolkit/chrome/global/console.dtd
toolkit/chrome/global/customizeCharset.dtd
toolkit/chrome/global/customizeToolbar.dtd
toolkit/chrome/global/dialogOverlay.dtd
toolkit/chrome/global/editMenuOverlay.dtd
toolkit/chrome/global/filepicker.dtd
toolkit/chrome/global/filepicker.properties
toolkit/chrome/global/globalKeys.dtd
toolkit/chrome/global/headsUpDisplay.properties
toolkit/chrome/global/preferences.dtd
toolkit/chrome/global/printPageSetup.dtd
toolkit/chrome/global/printPreview.dtd
toolkit/chrome/global/printPreviewProgress.dtd
toolkit/chrome/global/printProgress.dtd
toolkit/chrome/global/printdialog.dtd
toolkit/chrome/global/viewSource.dtd
toolkit/chrome/global/webConsole.dtd
toolkit/chrome/global/wizard.dtd
toolkit/chrome/mozapps/downloads/downloads.dtd
toolkit/chrome/mozapps/downloads/settingsChange.dtd
toolkit/chrome/mozapps/downloads/unknownContentType.dtd
toolkit/chrome/mozapps/extensions/about.dtd
toolkit/chrome/mozapps/extensions/blocklist.dtd
toolkit/chrome/mozapps/extensions/extensions.dtd
toolkit/chrome/mozapps/extensions/extensions.properties
toolkit/chrome/mozapps/extensions/update.dtd
toolkit/chrome/mozapps/help/help.dtd
toolkit/chrome/mozapps/plugins/plugins.dtd
toolkit/chrome/mozapps/plugins/plugins.properties
toolkit/chrome/mozapps/preferences/changemp.dtd
toolkit/chrome/mozapps/preferences/ocsp.dtd
toolkit/chrome/mozapps/preferences/removemp.dtd
toolkit/chrome/mozapps/profile/createProfileWizard.dtd
toolkit/chrome/mozapps/profile/profileSelection.dtd
toolkit/chrome/mozapps/profile/profileSelection.properties
toolkit/chrome/mozapps/update/history.dtd
toolkit/chrome/mozapps/update/updates.dtd
toolkit/chrome/mozapps/update/updates.properties
toolkit/chrome/mozapps/xpinstall/xpinstallConfirm.dtd
toolkit/chrome/passwordmgr/passwordManager.dtd
toolkit/chrome/places/places.properties
toolkit/crashreporter/crashes.dtd
--- a/browser/chrome/browser/aboutCertError.dtd
+++ b/browser/chrome/browser/aboutCertError.dtd
@@ -1,16 +1,16 @@
 <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
   %brandDTD;
 <!-- These strings are used by Firefox's custom about:certerror page,
 a replacement for the standard security certificate errors produced
 by NSS/PSM via netError.xhtml. -->
 
 
-<!ENTITY certerror.pagetitle "āĻ…āύāĻŋāĻ°ā§āĻ­āϰāϝ⧋āĻ—ā§āϝ āϏāĻ‚āϝ⧋āĻ—">
+<!ENTITY certerror.pagetitle  "āĻ…āύāĻŋāĻ°ā§āĻ­āϰāϝ⧋āĻ—ā§āϝ āϏāĻ‚āϝ⧋āĻ—">
 <!ENTITY certerror.longpagetitle "āĻāχ āϏāĻ‚āϝ⧋āĻ—āϟāĻŋ āĻ…āύāĻŋāĻ°ā§āĻ­āϰāϝ⧋āĻ—ā§āϝ">
 <!-- Localization note (certerror.introPara1) - The string "#1" will
 be replaced at runtime with the name of the server to which the user
 was trying to connect. -->
 
 <!ENTITY certerror.introPara1 "āφāĻĒāύāĻŋ &brandShortName;āϕ⧇ 
 <b>#1</b> āĻāϰ āϏāĻžāĻĨ⧇ āύāĻŋāϰāĻžāĻĒāĻĻāĻ­āĻžāĻŦ⧇ āϏāĻ‚āϝ⧁āĻ•ā§āϤ āĻšāϤ⧇ āĻŦāϞ⧇āϛ⧇āύ, āĻ•āĻŋāĻ¨ā§āϤ⧁ āϏāĻ‚āϝ⧋āĻ—āϟāĻŋ āύāĻŋāϰāĻžāĻĒāĻĻ āĻ•āĻŋāύāĻž āϤāĻž āύāĻŋāĻļā§āϚāĻŋāϤ āĻ•āϰāĻž āϏāĻŽā§āĻ­āĻŦ āĻšāĻšā§āϛ⧇ āύāĻžāĨ¤">
 <!ENTITY certerror.introPara2 "āϏāĻžāϧāĻžāϰāĻŖāϤ āφāĻĒāύāĻŋ āϝāĻ–āύ āύāĻŋāϰāĻžāĻĒāĻĻāĻ­āĻžāĻŦ⧇ āϏāĻ‚āϝ⧁āĻ•ā§āϤ āĻšāϤ⧇ āϚāĻžāύ, āϏāĻžāχāϟāϗ⧁āϞ⧋ āύāĻŋāĻ°ā§āĻ­āϰāϝ⧋āĻ—ā§āϝ āĻĒāϰāĻŋāϚ⧟ āĻĒā§āϰāĻŽāĻžāύ āωāĻĒāĻ¸ā§āĻĨāĻžāĻĒāύ āĻ•āϰ⧇ āφāĻĒāύāĻžāϕ⧇ āύāĻŋāĻļā§āϚāĻŋāϤ āĻ•āϰ⧇āĨ¤ āĻ•āĻŋāĻ¨ā§āϤ⧁, āĻāχ āϏāĻžāχāĻŸā§‡āϰ āĻĒāϰāĻŋāĻšā§Ÿā§‡āϰ āϏāĻ¤ā§āϝāϤāĻž āϝāĻžāϚāĻžāχ āĻ•āϰāĻž āϝāĻžāĻšā§āϛ⧇ āύāĻžāĨ¤">
--- a/browser/chrome/browser/aboutDialog.dtd
+++ b/browser/chrome/browser/aboutDialog.dtd
@@ -1,80 +1,80 @@
-<!ENTITY aboutDialog.title "&brandFullName; āϏāĻŽā§āĻĒāĻ°ā§āĻ•āĻŋāϤ">
+<!ENTITY aboutDialog.title          "&brandFullName; āϏāĻŽā§āĻĒāĻ°ā§āĻ•āĻŋāϤ">
 
-<!ENTITY community.start2 "&brandShortName; āύāĻ•āĻļāĻž āĻ•āϰāĻž āĻšā§Ÿā§‡āϛ⧇">
+<!ENTITY community.start2           "&brandShortName; āύāĻ•āĻļāĻž āĻ•āϰāĻž āĻšā§Ÿā§‡āϛ⧇">
 <!-- LOCALIZATION NOTE (community.mozillaLink): This is a link title that links to http://www.mozilla.org/. -->
-<!ENTITY community.mozillaLink "&vendorShortName;">
-<!ENTITY community.middle2 ", a">
+<!ENTITY community.mozillaLink      "&vendorShortName;">
+<!ENTITY community.middle2          ", a">
 <!-- LOCALIZATION NOTE (community.creditsLink): This is a link title that links to about:credits. -->
-<!ENTITY community.creditsLink "āĻ—ā§āϞ⧋āĻŦāĻžāϞ āĻ•āĻŽāĻŋāωāύāĻŋāϟāĻŋ">
-<!ENTITY community.end2 "āφāϰāĻ“ āĻ­āĻžāϞ⧋āĻ­āĻžāĻŦ⧇ āχāĻ¨ā§āϟāĻžāϰāύ⧇āϟ āĻŦā§āϝāĻŦāĻšāĻžāϰ āĻ•āϰāĻžāϰ āϜāĻ¨ā§āϝ āĻāĻ•āϏāĻžāĻĨ⧇ āĻ•āĻžāϜ āĻ•āϰāĻžāĨ¤ āφāĻŽāϰāĻž āĻŦāĻŋāĻļā§āĻŦāĻžāϏ āĻ•āϰāĻŋ āϝ⧇, āϕ⧋āύ⧋ āϧāϰāϪ⧇āϰ āĻŦāĻžāϧāĻž āĻ›āĻžā§œāĻžāχ āχāĻ¨ā§āϟāĻžāϰāύ⧇āϟ āωāĻ¨ā§āĻŽā§āĻ•ā§āϤ, āĻĒāĻžāĻŦāϞāĻŋāĻ• āĻāĻŦāĻ‚ āϏāĻŦāĻžāϰ āĻŦā§āϝāĻŦāĻšāĻžāϰāϝ⧋āĻ—ā§āϝ āĻšāĻ“ā§ŸāĻž āωāϚāĻŋāϤāĨ¤ ">
+<!ENTITY community.creditsLink      "āĻ—ā§āϞ⧋āĻŦāĻžāϞ āĻ•āĻŽāĻŋāωāύāĻŋāϟāĻŋ">
+<!ENTITY community.end2             "āφāϰāĻ“ āĻ­āĻžāϞ⧋āĻ­āĻžāĻŦ⧇ āχāĻ¨ā§āϟāĻžāϰāύ⧇āϟ āĻŦā§āϝāĻŦāĻšāĻžāϰ āĻ•āϰāĻžāϰ āϜāĻ¨ā§āϝ āĻāĻ•āϏāĻžāĻĨ⧇ āĻ•āĻžāϜ āĻ•āϰāĻžāĨ¤ āφāĻŽāϰāĻž āĻŦāĻŋāĻļā§āĻŦāĻžāϏ āĻ•āϰāĻŋ āϝ⧇, āϕ⧋āύ⧋ āϧāϰāϪ⧇āϰ āĻŦāĻžāϧāĻž āĻ›āĻžā§œāĻžāχ āχāĻ¨ā§āϟāĻžāϰāύ⧇āϟ āωāĻ¨ā§āĻŽā§āĻ•ā§āϤ, āĻĒāĻžāĻŦāϞāĻŋāĻ• āĻāĻŦāĻ‚ āϏāĻŦāĻžāϰ āĻŦā§āϝāĻŦāĻšāĻžāϰāϝ⧋āĻ—ā§āϝ āĻšāĻ“ā§ŸāĻž āωāϚāĻŋāϤāĨ¤ ">
 
-<!ENTITY contribute.start "āĻļ⧁āύāϤ⧇ āĻ•āĻŋ āφāĻ•āĻ°ā§āώāĻ¨ā§€ā§Ÿ?">
+<!ENTITY contribute.start           "āĻļ⧁āύāϤ⧇ āĻ•āĻŋ āφāĻ•āĻ°ā§āώāĻ¨ā§€ā§Ÿ?">
 <!-- LOCALIZATION NOTE (contribute.getInvolvedLink): This is a link title that links to http://www.mozilla.org/contribute/. -->
 <!ENTITY contribute.getInvolvedLink "āϜ⧜āĻŋāϤ āĻšā§‹āύ!">
-<!ENTITY contribute.end "">
+<!ENTITY contribute.end             "">
 <!-- LOCALIZATION NOTE (bottomLinks.license): This is a link title that links to about:license. -->
 
-<!ENTITY bottomLinks.license "āϞāĻžāχāϏ⧇āĻ¨ā§āϏāĻŋāĻ‚ āϤāĻĨā§āϝ">
+<!ENTITY bottomLinks.license        "āϞāĻžāχāϏ⧇āĻ¨ā§āϏāĻŋāĻ‚ āϤāĻĨā§āϝ">
 <!-- LOCALIZATION NOTE (bottomLinks.rights): This is a link title that links to about:rights. -->
 
-<!ENTITY bottomLinks.rights "āĻŦā§āϝāĻŦāĻšāĻžāϰāĻ•āĻžāϰ⧀āϰ āĻ…āϧāĻŋāĻ•āĻžāϰ āϏāĻŽāĻžāĻĒā§āϤ">
+<!ENTITY bottomLinks.rights         "āĻŦā§āϝāĻŦāĻšāĻžāϰāĻ•āĻžāϰ⧀āϰ āĻ…āϧāĻŋāĻ•āĻžāϰ āϏāĻŽāĻžāĻĒā§āϤ">
 <!-- LOCALIZATION NOTE (bottomLinks.privacy): This is a link title that links to http://www.mozilla.com/legal/privacy/. -->
 
-<!ENTITY bottomLinks.privacy " āĻ—ā§‹āĻĒāĻ¨ā§€ā§ŸāϤāĻž āύ⧀āϤāĻŋ">
+<!ENTITY bottomLinks.privacy        " āĻ—ā§‹āĻĒāĻ¨ā§€ā§ŸāϤāĻž āύ⧀āϤāĻŋ">
 <!-- LOCALIZATION NOTE (update.checkingForUpdates): try to make the localized text short (see bug 596813 for screenshots). -->
 
-<!ENTITY update.checkingForUpdates "āĻšāĻžāϞāύāĻžāĻ—āĻžāĻĻ āĻĒāϰ⧀āĻ•ā§āώāĻžâ€Ļ">
+<!ENTITY update.checkingForUpdates  "āĻšāĻžāϞāύāĻžāĻ—āĻžāĻĻ āĻĒāϰ⧀āĻ•ā§āώāĻžâ€Ļ">
 <!-- LOCALIZATION NOTE (update.checkingAddonCompat): try to make the localized text short (see bug 596813 for screenshots). -->
 <!ENTITY update.checkingAddonCompat "āĻ…ā§āϝāĻžāĻĄ-āĻ…āύ āĻāϰ āϏ⧁āϏāĻ‚āĻ—āϤāĻŋ āĻĒāϰ⧀āĻ•ā§āώāĻž āĻ•āϰāĻž āĻšāĻšā§āϛ⧇â€Ļ">
 <!-- LOCALIZATION NOTE (update.noUpdatesFound): try to make the localized text short (see bug 596813 for screenshots). -->
-<!ENTITY update.noUpdatesFound "&brandShortName; āĻšāĻžāϞāύāĻžāĻ—āĻžāĻĻāĻ•ā§ƒāϤ">
+<!ENTITY update.noUpdatesFound      "&brandShortName; āĻšāĻžāϞāύāĻžāĻ—āĻžāĻĻāĻ•ā§ƒāϤ">
 <!-- LOCALIZATION NOTE (update.adminDisabled): try to make the localized text short (see bug 596813 for screenshots). -->
-<!ENTITY update.adminDisabled "āϏāĻŋāĻ¸ā§āĻŸā§‡āĻŽ āĻĒā§āϰāĻļāĻžāϏāĻ• āĻ•āĻ°ā§āϤ⧃āĻ• āĻšāĻžāϞāύāĻžāĻ—āĻžāĻĻ āύāĻŋāĻ¸ā§āĻ•ā§āϰāĻŋ⧟">
+<!ENTITY update.adminDisabled       "āϏāĻŋāĻ¸ā§āĻŸā§‡āĻŽ āĻĒā§āϰāĻļāĻžāϏāĻ• āĻ•āĻ°ā§āϤ⧃āĻ• āĻšāĻžāϞāύāĻžāĻ—āĻžāĻĻ āύāĻŋāĻ¸ā§āĻ•ā§āϰāĻŋ⧟">
 <!-- LOCALIZATION NOTE (update.failed.start,update.failed.linkText,update.failed.end):
      update.failed.start, update.failed.linkText, and update.failed.end all go into
      one line with linkText being wrapped in an anchor that links to a site to download
      the latest version of Firefox (e.g. http://www.firefox.com). As this is all in
      one line, try to make the localized text short (see bug 596813 for screenshots). -->
 
-<!ENTITY update.failed.start "āĻšāĻžāϞāύāĻžāĻ—āĻžāĻĻ āĻŦā§āϝāĻ°ā§āĻĨāĨ¤">
-<!ENTITY update.failed.linkText "āϏāĻ°ā§āĻŦāĻļ⧇āώ āϏāĻ‚āĻ¸ā§āĻ•āϰāĻŖ āĻĄāĻžāωāύāϞ⧋āĻĄ">
-<!ENTITY update.failed.end "">
+<!ENTITY update.failed.start        "āĻšāĻžāϞāύāĻžāĻ—āĻžāĻĻ āĻŦā§āϝāĻ°ā§āĻĨāĨ¤">
+<!ENTITY update.failed.linkText     "āϏāĻ°ā§āĻŦāĻļ⧇āώ āϏāĻ‚āĻ¸ā§āĻ•āϰāĻŖ āĻĄāĻžāωāύāϞ⧋āĻĄ">
+<!ENTITY update.failed.end          "">
 <!-- LOCALIZATION NOTE (update.manual.start,update.manual.end): update.manual.start and update.manual.end
      all go into one line and have an anchor in between with text that is the same as the link to a site
      to download the latest version of Firefox (e.g. http://www.firefox.com). As this is all in one line,
      try to make the localized text short (see bug 596813 for screenshots). -->
 
-<!ENTITY update.manual.start "āĻšāĻžāϞāύāĻžāĻ—āĻžāĻĻ āĻĒāĻžāĻ“ā§ŸāĻž āϝāĻžā§Ÿ">
-<!ENTITY update.manual.end "">
+<!ENTITY update.manual.start        "āĻšāĻžāϞāύāĻžāĻ—āĻžāĻĻ āĻĒāĻžāĻ“ā§ŸāĻž āϝāĻžā§Ÿ">
+<!ENTITY update.manual.end          "">
 <!-- LOCALIZATION NOTE (update.downloading.start,update.downloading.end): update.downloading.start and 
      update.downloading.end all go into one line, with the amount downloaded inserted in between. As this
      is all in one line, try to make the localized text short (see bug 596813 for screenshots). The — is
      the "em dash" (long dash).
      example: Downloading update — 111 KB of 13 MB -->
 
-<!ENTITY update.downloading.start "āĻšāĻžāϞāύāĻžāĻ—āĻžāĻĻ āĻĄāĻžāωāύāϞ⧋āĻĄ āĻ•āϰāĻž āĻšāĻšā§āϛ⧇ — ">
-<!ENTITY update.downloading.end "">
+<!ENTITY update.downloading.start   "āĻšāĻžāϞāύāĻžāĻ—āĻžāĻĻ āĻĄāĻžāωāύāϞ⧋āĻĄ āĻ•āϰāĻž āĻšāĻšā§āϛ⧇ — ">
+<!ENTITY update.downloading.end     "">
 <!-- LOCALIZATION NOTE (channel.description.start,channel.description.end): channel.description.start and
      channel.description.end create one sentence, with the current channel label inserted in between.
      example: You are currently on the _Stable_ update channel. -->
 
-<!ENTITY channel.description.start "āφāĻĒāύāĻŋ āĻŦāĻ°ā§āϤāĻŽāĻžāύ⧇ āφāϛ⧇āύ">
-<!ENTITY channel.description.end "āĻšāĻžāϞāύāĻžāĻ—āĻžāĻĻ āĻšā§āϝāĻžāύ⧇āϞ⧇āĨ¤">
+<!ENTITY channel.description.start  "āφāĻĒāύāĻŋ āĻŦāĻ°ā§āϤāĻŽāĻžāύ⧇ āφāϛ⧇āύ">
+<!ENTITY channel.description.end    "āĻšāĻžāϞāύāĻžāĻ—āĻžāĻĻ āĻšā§āϝāĻžāύ⧇āϞ⧇āĨ¤">
 
-<!ENTITY channel.change "āĻĒāϰāĻŋāĻŦāĻ°ā§āϤāύ">
+<!ENTITY channel.change             "āĻĒāϰāĻŋāĻŦāĻ°ā§āϤāύ">
 
-<!ENTITY channel.release.description "āĻĒ⧃āĻĨāĻŋāĻŦā§€āϰ āĻĒā§āϰāϤāĻŋ āϞāĻžāϖ⧇ āĻāĻ•āĻļā§‹āϜāύ āĻŽāĻžāύ⧁āώ⧇āϰ āĻŽāĻ§ā§āϝ⧇ āĻŦā§āϝāĻŦāĻšā§ƒāϤ āĻšā§‡āĻˇā§āϟāĻžāĻ•ā§ƒāϤ āĻāĻŦāĻ‚ āϏāĻ°ā§āĻŦāĻļ⧇āώ āϰāĻŋāϞāĻŋāϜāϟāĻŋ āωāĻĒāĻ­ā§‹āĻ— āĻ•āϰ⧁āύāĨ¤ āĻ…āύ⧇āĻ• āĻ¸ā§āĻĒā§€āĻĄ, āϏāĻšāĻœā§‡ āĻŦ⧈āĻļāĻŋāĻˇā§āĻŸā§āϝ āĻ¸ā§āĻŦāύāĻŋāĻ°ā§āϧāĻžāϰāĻŖ āĻāĻŦāĻ‚ āϏāĻžāĻŽā§āĻĒā§āϰāϤāĻŋāĻ• āĻ“ā§Ÿā§‡āĻŦ āĻŸā§‡āĻ•āύ⧋āϞāϜāĻŋ āĻĻā§āĻŦāĻžāϰāĻž āφāĻĒāύāĻžāϰ āĻ…āύāϞāĻžāχāύ⧇ āĻ…āĻ­āĻŋāĻœā§āĻžāϤāĻž āĻ•āĻ¨ā§āĻŸā§āϰ⧋āϞ⧇ āϰāĻžāϖ⧁āύāĨ¤">
-<!ENTITY channel.beta.description "āφāϰāĻ“ āĻ¸ā§āĻĨāĻžā§Ÿā§€āĻ¤ā§āĻŦāϏāĻš āĻ•āĻžāϟāĻŋāĻ‚ āĻāϜ āĻŦ⧈āĻļāĻŋāĻˇā§āĻŸā§āϝ⧇āϰ āĻ…āĻ­āĻŋāĻœā§āĻžāϤāĻžāĨ¤ āϰāĻŋāĻĢāĻžāχāύ āĻāĻŦāĻ‚ āĻĒā§‹āϞāĻŋāĻļ āϏāĻšāĻžā§ŸāϤāĻž āĻ•āϰāϤ⧇ āĻŽāĻ¨ā§āϤāĻŦā§āϝ āĻĻāĻŋāύ āϝāĻž āĻ•āĻŋāύāĻž āϏāĻ°ā§āĻŦāĻļ⧇āώ āϰāĻŋāϞāĻŋāĻœā§‡ āĻĨāĻžāĻ•āĻŦ⧇āĨ¤">
-<!ENTITY channel.aurora.description "āϝāĻžāϰāĻž āĻŽāĻžāύ⧁āώāĻŋāĻ•āĻ­āĻžāĻŦ⧇ āϏāĻŦāϞ āϤāĻžāϰāĻž āĻ…āĻ¸ā§āĻĨāĻžā§Ÿā§€ āĻāĻ•āϟāĻŋ āĻĒāϰāĻŋāĻŦ⧇āĻļ⧇ āϏāĻŦāĻšā§‡ā§Ÿā§‡ āύāϤ⧁āύ āϝ⧇ āύāϤ⧁āύāĻ¤ā§āĻŦ āφāϛ⧇ āϤāĻžāϰ āĻ…āĻ­āĻŋāĻœā§āĻžāϤāĻž āύāĻŋāύāĨ¤ āĻĢāĻžāχāύāĻžāϞ āϰāĻŋāϞāĻŋāĻœā§‡ āĻ•āĻŋ āĻ•āĻŋ āĻĨāĻžāĻ•āĻŦ⧇ āϏ⧇ āĻŦ⧈āĻļāĻŋāĻˇā§āĻŸā§āϝ āĻāĻŦāĻ‚ āĻĒāĻžāϰāĻĢāϰāĻŽā§‡āĻ¨ā§āϏ āϏāĻŽā§āĻĒāĻ°ā§āϕ⧇ āĻŽāϤāĻžāĻŽāϤ āĻĻāĻŋāύāĨ¤">
+<!ENTITY channel.release.description       "āĻĒ⧃āĻĨāĻŋāĻŦā§€āϰ āĻĒā§āϰāϤāĻŋ āϞāĻžāϖ⧇ āĻāĻ•āĻļā§‹āϜāύ āĻŽāĻžāύ⧁āώ⧇āϰ āĻŽāĻ§ā§āϝ⧇ āĻŦā§āϝāĻŦāĻšā§ƒāϤ āĻšā§‡āĻˇā§āϟāĻžāĻ•ā§ƒāϤ āĻāĻŦāĻ‚ āϏāĻ°ā§āĻŦāĻļ⧇āώ āϰāĻŋāϞāĻŋāϜāϟāĻŋ āωāĻĒāĻ­ā§‹āĻ— āĻ•āϰ⧁āύāĨ¤ āĻ…āύ⧇āĻ• āĻ¸ā§āĻĒā§€āĻĄ, āϏāĻšāĻœā§‡ āĻŦ⧈āĻļāĻŋāĻˇā§āĻŸā§āϝ āĻ¸ā§āĻŦāύāĻŋāĻ°ā§āϧāĻžāϰāĻŖ āĻāĻŦāĻ‚ āϏāĻžāĻŽā§āĻĒā§āϰāϤāĻŋāĻ• āĻ“ā§Ÿā§‡āĻŦ āĻŸā§‡āĻ•āύ⧋āϞāϜāĻŋ āĻĻā§āĻŦāĻžāϰāĻž āφāĻĒāύāĻžāϰ āĻ…āύāϞāĻžāχāύ⧇ āĻ…āĻ­āĻŋāĻœā§āĻžāϤāĻž āĻ•āĻ¨ā§āĻŸā§āϰ⧋āϞ⧇ āϰāĻžāϖ⧁āύāĨ¤">
+<!ENTITY channel.beta.description          "āφāϰāĻ“ āĻ¸ā§āĻĨāĻžā§Ÿā§€āĻ¤ā§āĻŦāϏāĻš āĻ•āĻžāϟāĻŋāĻ‚ āĻāϜ āĻŦ⧈āĻļāĻŋāĻˇā§āĻŸā§āϝ⧇āϰ āĻ…āĻ­āĻŋāĻœā§āĻžāϤāĻžāĨ¤ āϰāĻŋāĻĢāĻžāχāύ āĻāĻŦāĻ‚ āĻĒā§‹āϞāĻŋāĻļ āϏāĻšāĻžā§ŸāϤāĻž āĻ•āϰāϤ⧇ āĻŽāĻ¨ā§āϤāĻŦā§āϝ āĻĻāĻŋāύ āϝāĻž āĻ•āĻŋāύāĻž āϏāĻ°ā§āĻŦāĻļ⧇āώ āϰāĻŋāϞāĻŋāĻœā§‡ āĻĨāĻžāĻ•āĻŦ⧇āĨ¤">
+<!ENTITY channel.aurora.description        "āϝāĻžāϰāĻž āĻŽāĻžāύ⧁āώāĻŋāĻ•āĻ­āĻžāĻŦ⧇ āϏāĻŦāϞ āϤāĻžāϰāĻž āĻ…āĻ¸ā§āĻĨāĻžā§Ÿā§€ āĻāĻ•āϟāĻŋ āĻĒāϰāĻŋāĻŦ⧇āĻļ⧇ āϏāĻŦāĻšā§‡ā§Ÿā§‡ āύāϤ⧁āύ āϝ⧇ āύāϤ⧁āύāĻ¤ā§āĻŦ āφāϛ⧇ āϤāĻžāϰ āĻ…āĻ­āĻŋāĻœā§āĻžāϤāĻž āύāĻŋāύāĨ¤ āĻĢāĻžāχāύāĻžāϞ āϰāĻŋāϞāĻŋāĻœā§‡ āĻ•āĻŋ āĻ•āĻŋ āĻĨāĻžāĻ•āĻŦ⧇ āϏ⧇ āĻŦ⧈āĻļāĻŋāĻˇā§āĻŸā§āϝ āĻāĻŦāĻ‚ āĻĒāĻžāϰāĻĢāϰāĻŽā§‡āĻ¨ā§āϏ āϏāĻŽā§āĻĒāĻ°ā§āϕ⧇ āĻŽāϤāĻžāĻŽāϤ āĻĻāĻŋāύāĨ¤">
 <!-- LOCALIZATION NOTE (channel.selector.start,channel.selector.end): channel.selector.start and
      channel.selector.end create one sentence, with a channel selection menulist instered in between.
      This is all in one line, so try to make the localized text short.
      example: Switch to the [Stable] update channel. -->
 
-<!ENTITY channel.selector.start "āĻāϤ⧇ āϏ⧁āχāϚ āĻ•āϰ⧁āύ">
-<!ENTITY channel.selector.end "āĻšāĻžāϞāύāĻžāĻ—āĻžāĻĻ āĻšā§āϝāĻžāύ⧇āϞ⧇āĨ¤">
+<!ENTITY channel.selector.start          "āĻāϤ⧇ āϏ⧁āχāϚ āĻ•āϰ⧁āύ">
+<!ENTITY channel.selector.end            "āĻšāĻžāϞāύāĻžāĻ—āĻžāĻĻ āĻšā§āϝāĻžāύ⧇āϞ⧇āĨ¤">
 <!-- LOCALIZATION NOTE (channel.selector.applyButton): This button applies the user's choice to switch
      to a new update channel and starts the application update process. -->
 
-<!ENTITY channel.selector.applyButton "āĻĒā§āĻ°ā§Ÿā§‹āĻ— āĻāĻŦāĻ‚ āĻšāĻžāϞāύāĻžāĻ—āĻžāĻĻ">
-<!ENTITY channel.selector.cancelButton "āĻŦāĻžāϤāĻŋāϞ">
+<!ENTITY channel.selector.applyButton    "āĻĒā§āĻ°ā§Ÿā§‹āĻ— āĻāĻŦāĻ‚ āĻšāĻžāϞāύāĻžāĻ—āĻžāĻĻ">
+<!ENTITY channel.selector.cancelButton   "āĻŦāĻžāϤāĻŋāϞ">
--- a/browser/chrome/browser/aboutHome.dtd
+++ b/browser/chrome/browser/aboutHome.dtd
@@ -1,17 +1,14 @@
 <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
   %brandDTD;
 <!-- These strings are used in the about:home page -->
 
 
 <!ENTITY abouthome.pageTitle "&brandFullName; āĻļ⧁āϰ⧁āϰ āĻĒ⧃āĻˇā§āĻ āĻž">
-<!-- LOCALIZATION NOTE (abouthome.brandStart):
-     brandShortName must be in a <span/>
--->
 
 <!ENTITY abouthome.searchEngineButton.label "āĻ…āύ⧁āϏāĻ¨ā§āϧāĻžāύ">
 
 <!ENTITY abouthome.aboutMozilla "āĻŽā§‹āϜāĻŋāϞāĻž āϏāĻŽā§āĻĒāĻ°ā§āĻ•āĻŋāϤ">
 <!-- LOCALIZATION NOTE (abouthome.defaultSnippet1.v1):
      text in <a/> will be linked to the Firefox features page on mozilla.com
 -->
 
--- a/browser/chrome/browser/aboutPrivateBrowsing.dtd
+++ b/browser/chrome/browser/aboutPrivateBrowsing.dtd
@@ -1,24 +1,24 @@
-<!ENTITY privatebrowsingpage.title "āĻāĻ•āĻžāĻ¨ā§āϤ āĻŦā§āϰāĻžāωāϜāĻŋāĻ‚">
-<!ENTITY privatebrowsingpage.title.normal "āφāĻĒāύāĻŋ āĻ•āĻŋ āĻāĻ•āĻžāĻ¨ā§āϤ āĻŦā§āϰāĻžāωāϜāĻŋāĻ‚ āĻļ⧁āϰ⧁ āĻ•āϰāϤ⧇ āϚāĻžāύ?">
+<!ENTITY privatebrowsingpage.title                 "āĻāĻ•āĻžāĻ¨ā§āϤ āĻŦā§āϰāĻžāωāϜāĻŋāĻ‚">
+<!ENTITY privatebrowsingpage.title.normal          "āφāĻĒāύāĻŋ āĻ•āĻŋ āĻāĻ•āĻžāĻ¨ā§āϤ āĻŦā§āϰāĻžāωāϜāĻŋāĻ‚ āĻļ⧁āϰ⧁ āĻ•āϰāϤ⧇ āϚāĻžāύ?">
 
-<!ENTITY privatebrowsingpage.issueDesc "&brandShortName; āĻāχ āϏ⧇āĻļāύ⧇āϰ āϕ⧋āύ⧋ āχāϤāĻŋāĻšāĻžāϏ āĻŽāύ⧇ āϰāĻžāĻ–āĻŦ⧇ āύāĻžāĨ¤">
-<!ENTITY privatebrowsingpage.issueDesc.normal "&brandShortName; āĻŦāĻ°ā§āϤāĻŽāĻžāύ⧇ āĻāĻ•āĻžāĻ¨ā§āϤ āĻŦā§āϰāĻžāωāϜāĻŋāĻ‚ āĻŽā§‹āĻĄā§‡ āύ⧇āχāĨ¤">
+<!ENTITY privatebrowsingpage.issueDesc                 "&brandShortName; āĻāχ āϏ⧇āĻļāύ⧇āϰ āϕ⧋āύ⧋ āχāϤāĻŋāĻšāĻžāϏ āĻŽāύ⧇ āϰāĻžāĻ–āĻŦ⧇ āύāĻžāĨ¤">
+<!ENTITY privatebrowsingpage.issueDesc.normal          "&brandShortName; āĻŦāĻ°ā§āϤāĻŽāĻžāύ⧇ āĻāĻ•āĻžāĻ¨ā§āϤ āĻŦā§āϰāĻžāωāϜāĻŋāĻ‚ āĻŽā§‹āĻĄā§‡ āύ⧇āχāĨ¤">
 
-<!ENTITY privatebrowsingpage.description "āĻāĻ•āĻžāĻ¨ā§āϤ āĻŦā§āϰāĻžāωāϜāĻŋāĻ‚ āϏ⧇āĻļāύ⧇, &brandShortName; āϕ⧋āύ āĻŦā§āϰāĻžāωāϜ āχāϤāĻŋāĻšāĻžāϏ, āĻ…āύ⧁āϏāĻ¨ā§āϧāĻžāύ āχāϤāĻŋāĻšāĻžāϏ, āĻĄāĻžāωāύāϞ⧋āĻĄ āχāϤāĻŋāĻšāĻžāϏ, āĻ“ā§Ÿā§‡āĻŦ āĻĢāϰāĻŽ āχāϤāĻŋāĻšāĻžāϏ, āϕ⧁āĻ•āĻŋ, āĻŦāĻž āĻ…āĻ¸ā§āĻĨāĻžā§Ÿā§€ āχāĻ¨ā§āϟāĻžāϰāύ⧇āϟ āĻĢāĻžāχāϞ āϏāĻ‚āϰāĻ•ā§āώāĻŖ āĻ•āϰāĻŦ⧇ āύāĻžāĨ¤ āϤāĻŦ⧇, āφāĻĒāύāĻŋ āϝ⧇ āϏāĻŽāĻ¸ā§āϤ āĻĢāĻžāχāϞ āĻĄāĻžāωāύāϞ⧋āĻĄ āĻ•āϰāĻŦ⧇āύ āĻŦāĻž āϝ⧇ āĻŦ⧁āĻ•āĻŽāĻžāĻ°ā§āĻ•āϗ⧁āϞ⧋ āϤ⧈āϰ⧀ āĻ•āϰāĻŦ⧇āύ āϤāĻž āϏāĻ‚āϰāĻ•ā§āώāĻŖ āĻ•āϰāĻŦ⧇āĨ¤">
+<!ENTITY privatebrowsingpage.description               "āĻāĻ•āĻžāĻ¨ā§āϤ āĻŦā§āϰāĻžāωāϜāĻŋāĻ‚ āϏ⧇āĻļāύ⧇, &brandShortName; āϕ⧋āύ āĻŦā§āϰāĻžāωāϜ āχāϤāĻŋāĻšāĻžāϏ, āĻ…āύ⧁āϏāĻ¨ā§āϧāĻžāύ āχāϤāĻŋāĻšāĻžāϏ, āĻĄāĻžāωāύāϞ⧋āĻĄ āχāϤāĻŋāĻšāĻžāϏ, āĻ“ā§Ÿā§‡āĻŦ āĻĢāϰāĻŽ āχāϤāĻŋāĻšāĻžāϏ, āϕ⧁āĻ•āĻŋ, āĻŦāĻž āĻ…āĻ¸ā§āĻĨāĻžā§Ÿā§€ āχāĻ¨ā§āϟāĻžāϰāύ⧇āϟ āĻĢāĻžāχāϞ āϏāĻ‚āϰāĻ•ā§āώāĻŖ āĻ•āϰāĻŦ⧇ āύāĻžāĨ¤ āϤāĻŦ⧇, āφāĻĒāύāĻŋ āϝ⧇ āϏāĻŽāĻ¸ā§āϤ āĻĢāĻžāχāϞ āĻĄāĻžāωāύāϞ⧋āĻĄ āĻ•āϰāĻŦ⧇āύ āĻŦāĻž āϝ⧇ āĻŦ⧁āĻ•āĻŽāĻžāĻ°ā§āĻ•āϗ⧁āϞ⧋ āϤ⧈āϰ⧀ āĻ•āϰāĻŦ⧇āύ āϤāĻž āϏāĻ‚āϰāĻ•ā§āώāĻŖ āĻ•āϰāĻŦ⧇āĨ¤">
 <!-- LOCALIZATION NOTE (privatebrowsingpage.clearRecentHistoryBefore): include a trailing space as needed -->
 <!-- LOCALIZATION NOTE (privatebrowsingpage.clearRecentHistoryAfter): include a starting space as needed -->
 
-<!ENTITY privatebrowsingpage.clearRecentHistoryBefore "āφāĻĒāύāĻŋ āϚāĻžāχāϞ⧇ āĻļ⧁āϰ⧁āϤ⧇  ">
-<!ENTITY privatebrowsingpage.clearRecentHistoryInner "āφāĻĒāύāĻžāϰ āϏāĻžāĻŽā§āĻĒā§āϰāϤāĻŋāĻ• āχāϤāĻŋāĻšāĻžāϏ āĻŽā§āϛ⧇ āĻĢ⧇āϞāϤ⧇ āĻĒāĻžāϰ⧇āύ ">
-<!ENTITY privatebrowsingpage.clearRecentHistoryAfter ".">
+<!ENTITY privatebrowsingpage.clearRecentHistoryBefore  "āφāĻĒāύāĻŋ āϚāĻžāχāϞ⧇ āĻļ⧁āϰ⧁āϤ⧇  ">
+<!ENTITY privatebrowsingpage.clearRecentHistoryInner   "āφāĻĒāύāĻžāϰ āϏāĻžāĻŽā§āĻĒā§āϰāϤāĻŋāĻ• āχāϤāĻŋāĻšāĻžāϏ āĻŽā§āϛ⧇ āĻĢ⧇āϞāϤ⧇ āĻĒāĻžāϰ⧇āύ ">
+<!ENTITY privatebrowsingpage.clearRecentHistoryAfter   ".">
 
 <!ENTITY privatebrowsingpage.startPrivateBrowsing.label "āĻāĻ•āĻžāĻ¨ā§āϤ āĻŦā§āϰāĻžāωāϜāĻŋāĻ‚ āĻļ⧁āϰ⧁ āĻ•āϰ⧁āύ (P)">
 <!ENTITY privatebrowsingpage.startPrivateBrowsing.accesskey "P">
 <!-- LOCALIZATION NOTE (privatebrowsingpage.howToStop2): please leave &basePBMenu.label; intact in the translation -->
 <!-- LOCALIZATION NOTE (privatebrowsingpage.howToStart2): please leave &basePBMenu.label; intact in the translation -->
 
-<!ENTITY privatebrowsingpage.howToStop2 "āĻāĻ•āĻžāĻ¨ā§āϤ āĻŦā§āϰāĻžāωāϜāĻŋāĻ‚ āĻŦāĻ¨ā§āϧ āĻ•āϰāϤ⧇, &basePBMenu.label; &gt; privateBrowsingCmd.stop.label āύāĻŋāĻ°ā§āĻŦāĻžāϚāύ;, āĻ…āĻĨāĻŦāĻž&brandShortName; āĻŦāĻ¨ā§āϧāĨ¤">
-<!ENTITY privatebrowsingpage.howToStart2 "āĻāĻ•āĻžāĻ¨ā§āϤ āĻŦā§āϰāĻžāωāϜāĻŋāĻ‚ āφāϰāĻŽā§āĻ­ āĻ•āϰāϤ⧇ , basePBMenu.label āĻ“ āύāĻŋāĻ°ā§āĻŦāĻžāϚāύ āĻ•āϰāϤ⧇ āĻĒāĻžāϰ⧇āύ; &gt; &privateBrowsingCmd.start.label;āĨ¤">
+<!ENTITY privatebrowsingpage.howToStop2                "āĻāĻ•āĻžāĻ¨ā§āϤ āĻŦā§āϰāĻžāωāϜāĻŋāĻ‚ āĻŦāĻ¨ā§āϧ āĻ•āϰāϤ⧇, &basePBMenu.label; &gt; privateBrowsingCmd.stop.label āύāĻŋāĻ°ā§āĻŦāĻžāϚāύ;, āĻ…āĻĨāĻŦāĻž&brandShortName; āĻŦāĻ¨ā§āϧāĨ¤">
+<!ENTITY privatebrowsingpage.howToStart2               "āĻāĻ•āĻžāĻ¨ā§āϤ āĻŦā§āϰāĻžāωāϜāĻŋāĻ‚ āφāϰāĻŽā§āĻ­ āĻ•āϰāϤ⧇ , basePBMenu.label āĻ“ āύāĻŋāĻ°ā§āĻŦāĻžāϚāύ āĻ•āϰāϤ⧇ āĻĒāĻžāϰ⧇āύ; &gt; &privateBrowsingCmd.start.label;āĨ¤">
 
-<!ENTITY privatebrowsingpage.moreInfo "āϝāĻĻāĻŋāĻ“ āĻāχ āĻ•āĻŽā§āĻĒāĻŋāωāϟāĻžāϰ⧇ āφāĻĒāύāĻžāϰ āĻŦā§āϰāĻžāωāϜāĻŋāĻ‚ āχāϤāĻŋāĻšāĻžāϏ⧇āϰ āϕ⧋āύ āϰ⧇āĻ•āĻ°ā§āĻĄ āĻĨāĻžāĻ•āĻŦ⧇ āύāĻž,  āφāĻĒāύāĻžāϰ āχāĻ¨ā§āϟāĻžāϰāύ⧇āϟ āϏ⧇āĻŦāĻž āĻĒā§āϰāĻĻāĻžāύāĻ•āĻžāϰ⧀ āĻŦāĻž āφāĻĒāύāĻžāϰ āĻ•āĻ°ā§āĻŽāĻ•āĻ°ā§āϤāĻžāĻ—āύ āφāĻĒāύāĻžāϰ āĻĒāϰāĻŋāĻĻāĻ°ā§āĻļāĻŋāϤ āĻĒāĻžāϤāĻžāϗ⧁āϞ⧋ āĻ…āĻŦāϞ⧋āĻ•āύ āĻ•āϰāϤ⧇ āĻĒāĻžāϰ⧇āĨ¤">
-<!ENTITY privatebrowsingpage.learnMore "āφāϰāĻ“ āϤāĻĨā§āϝ āϜāĻžāύ⧁āύ">
+<!ENTITY privatebrowsingpage.moreInfo                  "āϝāĻĻāĻŋāĻ“ āĻāχ āĻ•āĻŽā§āĻĒāĻŋāωāϟāĻžāϰ⧇ āφāĻĒāύāĻžāϰ āĻŦā§āϰāĻžāωāϜāĻŋāĻ‚ āχāϤāĻŋāĻšāĻžāϏ⧇āϰ āϕ⧋āύ āϰ⧇āĻ•āĻ°ā§āĻĄ āĻĨāĻžāĻ•āĻŦ⧇ āύāĻž,  āφāĻĒāύāĻžāϰ āχāĻ¨ā§āϟāĻžāϰāύ⧇āϟ āϏ⧇āĻŦāĻž āĻĒā§āϰāĻĻāĻžāύāĻ•āĻžāϰ⧀ āĻŦāĻž āφāĻĒāύāĻžāϰ āĻ•āĻ°ā§āĻŽāĻ•āĻ°ā§āϤāĻžāĻ—āύ āφāĻĒāύāĻžāϰ āĻĒāϰāĻŋāĻĻāĻ°ā§āĻļāĻŋāϤ āĻĒāĻžāϤāĻžāϗ⧁āϞ⧋ āĻ…āĻŦāϞ⧋āĻ•āύ āĻ•āϰāϤ⧇ āĻĒāĻžāϰ⧇āĨ¤">
+<!ENTITY privatebrowsingpage.learnMore                 "āφāϰāĻ“ āϤāĻĨā§āϝ āϜāĻžāύ⧁āύ">
--- a/browser/chrome/browser/aboutRobots.dtd
+++ b/browser/chrome/browser/aboutRobots.dtd
@@ -1,17 +1,17 @@
 <!-- These strings are used in the about:robots page, which ties in with the
      robots theme used in the Firefox 3 Beta 2/3 first run pages...
          https://www.mozilla.com/en-US/firefox/3.0b2/firstrun/
          https://www.mozilla.com/en-US/firefox/3.0b3/firstrun/
      They're just meant to be fun and whimsical, with references to some geeky
      but well-known robots in movies and books. Be creative with translations! -->
 <!-- Nonsense line from the movie "The Day The Earth Stood Still". No translation needed. -->
 
-<!ENTITY robots.pagetitle "āĻ—āĻ°ā§āϟ! āĻ•ā§āϞāĻžāϟ⧁ āĻŦāĻžāϰāĻžāĻĄāĻž āύāĻŋāĻ•ā§āĻŸā§‹!">
+<!ENTITY robots.pagetitle  "āĻ—āĻ°ā§āϟ! āĻ•ā§āϞāĻžāϟ⧁ āĻŦāĻžāϰāĻžāĻĄāĻž āύāĻŋāĻ•ā§āĻŸā§‹!">
 <!-- Movie: Logan's Run... Box (cybog): "Welcome Humans! I am ready for you." -->
 <!ENTITY robots.errorTitleText "āĻŽāĻžāύ⧁āώ, āϤ⧋āĻŽāĻžā§Ÿ āĻ¸ā§āĻŦāĻžāĻ—āϤāĻŽ!">
 <!-- Movie: The Day The Earth Stood Still. Spoken by Klaatu. -->
 <!ENTITY robots.errorShortDescText "āφāĻŽāϰāĻž āφāĻĒāύāĻžāĻĻ⧇āϰ āĻ•āĻžāϛ⧇ āĻāϏ⧇āĻ›āĻŋ āĻļāĻžāĻ¨ā§āϤāĻŋ āĻāĻŦāĻ‚ āĻŦāĻ¨ā§āϧ⧁āĻ¤ā§āĻŦ⧇āϰ āĻ•āĻžāĻŽāύāĻžā§Ÿ!">
 <!-- Various books by Isaac Asimov. http://en.wikipedia.org/wiki/Three_Laws_of_Robotics -->
 <!ENTITY robots.errorLongDesc1 "āϰ⧋āĻŦāϟ āĻ•āĻ–āύ⧋ āĻŽāĻžāύ⧁āώāϕ⧇ āφāϘāĻžāϤ āĻ•āϰāϤ⧇ āĻĒāĻžāϰ⧇ āύāĻž, āĻŦāĻž āϤāĻžāϰ āύāĻŋāĻˇā§āĻ•ā§āϰāĻŋ⧟āϤāĻžāϰ āĻĻā§āĻŦāĻžāϰāĻž, āĻŽāĻžāύ⧁āώ⧇āϰ āĻ•ā§āώāϤāĻŋ āĻšāϤ⧇ āĻĻāĻŋāϤ⧇ āĻĒāĻžāϰ⧇ āύāĻžāĨ¤">
 <!-- Movie: Blade Runner. Batty: "I've seen things you people wouldn't believe..." -->
 <!ENTITY robots.errorLongDesc2 "āϰ⧋āĻŦā§‹āϟ āĻāĻŽāύ āϏāĻŦ āϜāĻŋāύāĻŋāϏ āĻĻ⧇āϖ⧇āϛ⧇ āϝāĻž āφāĻĒāύāĻžāϰāĻž āĻ•āĻ˛ā§āĻĒāύāĻžāĻ“ āĻ•āϰāϤ⧇ āĻĒāĻžāϰ⧇āύ āύāĻžāĨ¤">
--- a/browser/chrome/browser/aboutSessionRestore.dtd
+++ b/browser/chrome/browser/aboutSessionRestore.dtd
@@ -1,19 +1,19 @@
-<!ENTITY restorepage.tabtitle "āϏ⧇āĻļāύ āĻĒ⧁āύāϰ⧁āĻĻā§āϧāĻžāϰ">
+<!ENTITY restorepage.tabtitle       "āϏ⧇āĻļāύ āĻĒ⧁āύāϰ⧁āĻĻā§āϧāĻžāϰ">
 <!-- LOCALIZATION NOTE: The title is intended to be apologetic and disarming, expressing dismay
      and regret that we are unable to restore the session for the user -->
 
-<!ENTITY restorepage.errorTitle "āφāĻŽāϰāĻž āφāĻ¨ā§āϤāϰāĻŋāĻ•āĻ­āĻžāĻŦ⧇ āĻĻ⧁āσāĻ–āĻŋāϤ...">
-<!ENTITY restorepage.problemDesc "āφāĻĒāύāĻžāϰ āωāχāĻ¨ā§āĻĄā§‹ āĻāĻŦāĻ‚ āĻŸā§āϝāĻžāĻŦ āϖ⧁āρāĻœā§‡ āĻĒ⧇āϤ⧇ &brandShortName; āĻāϰ āĻ•āĻŋāϛ⧁āϟāĻž āĻŦ⧇āĻ— āĻĒ⧇āϤ⧇ āĻšāĻšā§āϛ⧇āĨ¤ āϏāĻžāϧāĻžāϰāĻŖāϤ āĻāϟāĻŋ āϏāĻŽā§āĻĒā§āϰāϤāĻŋ āĻ–ā§‹āϞāĻž āϕ⧋āύ āĻ“ā§Ÿā§‡āĻŦāĻĒ⧇āĻœā§‡āϰ āĻ•āĻžāϰāϪ⧇ āĻšā§Ÿā§‡ āĻĨāĻžāϕ⧇āĨ¤">
-<!ENTITY restorepage.tryThis "āφāĻĒāύāĻŋ āϝāĻž āϝāĻž āĻšā§‡āĻˇā§āϟāĻž āĻ•āϰāϤ⧇ āĻĒāĻžāϰ⧇āύ:">
-<!ENTITY restorepage.restoreSome "āϐ āϏāĻŽāĻ¸ā§āϤ āĻŸā§āϝāĻžāĻŦ āϝ⧇āϗ⧁āϞ⧋ āĻāχ āϏāĻŽāĻ¸ā§āϝāĻžāϰ āϜāĻ¨ā§āϝ āĻĻāĻžā§Ÿā§€ āĻšāϤ⧇ āĻĒāĻžāϰ⧇ āϏ⧇āϗ⧁āϞ⧋ āĻŦāĻ¨ā§āϧ āĻ•āϰ⧇ āĻĻā§‡ā§ŸāĻžāĨ¤">
-<!ENTITY restorepage.startNew "āĻāĻ•āϟāĻŋ āύāϤ⧁āύ āĻŦā§āϰāĻžāωāϜāĻŋāĻ‚ āϏ⧇āĻļāύ āĻļ⧁āϰ⧁ āĻ•āϰāĻž">
+<!ENTITY restorepage.errorTitle     "āφāĻŽāϰāĻž āφāĻ¨ā§āϤāϰāĻŋāĻ•āĻ­āĻžāĻŦ⧇ āĻĻ⧁āσāĻ–āĻŋāϤ...">
+<!ENTITY restorepage.problemDesc    "āφāĻĒāύāĻžāϰ āωāχāĻ¨ā§āĻĄā§‹ āĻāĻŦāĻ‚ āĻŸā§āϝāĻžāĻŦ āϖ⧁āρāĻœā§‡ āĻĒ⧇āϤ⧇ &brandShortName; āĻāϰ āĻ•āĻŋāϛ⧁āϟāĻž āĻŦ⧇āĻ— āĻĒ⧇āϤ⧇ āĻšāĻšā§āϛ⧇āĨ¤ āϏāĻžāϧāĻžāϰāĻŖāϤ āĻāϟāĻŋ āϏāĻŽā§āĻĒā§āϰāϤāĻŋ āĻ–ā§‹āϞāĻž āϕ⧋āύ āĻ“ā§Ÿā§‡āĻŦāĻĒ⧇āĻœā§‡āϰ āĻ•āĻžāϰāϪ⧇ āĻšā§Ÿā§‡ āĻĨāĻžāϕ⧇āĨ¤">
+<!ENTITY restorepage.tryThis        "āφāĻĒāύāĻŋ āϝāĻž āϝāĻž āĻšā§‡āĻˇā§āϟāĻž āĻ•āϰāϤ⧇ āĻĒāĻžāϰ⧇āύ:">
+<!ENTITY restorepage.restoreSome    "āϐ āϏāĻŽāĻ¸ā§āϤ āĻŸā§āϝāĻžāĻŦ āϝ⧇āϗ⧁āϞ⧋ āĻāχ āϏāĻŽāĻ¸ā§āϝāĻžāϰ āϜāĻ¨ā§āϝ āĻĻāĻžā§Ÿā§€ āĻšāϤ⧇ āĻĒāĻžāϰ⧇ āϏ⧇āϗ⧁āϞ⧋ āĻŦāĻ¨ā§āϧ āĻ•āϰ⧇ āĻĻā§‡ā§ŸāĻžāĨ¤">
+<!ENTITY restorepage.startNew       "āĻāĻ•āϟāĻŋ āύāϤ⧁āύ āĻŦā§āϰāĻžāωāϜāĻŋāĻ‚ āϏ⧇āĻļāύ āĻļ⧁āϰ⧁ āĻ•āϰāĻž">
 
 <!ENTITY restorepage.tryagainButton "āĻĒ⧁āύāϰ⧁āĻĻā§āϧāĻžāϰ">
 <!ENTITY restorepage.restore.access "R">
-<!ENTITY restorepage.cancelButton "āύāϤ⧁āύ āϏ⧇āĻļāύ āĻļ⧁āϰ⧁ (S)">
-<!ENTITY restorepage.cancel.access "S">
+<!ENTITY restorepage.cancelButton   "āύāϤ⧁āύ āϏ⧇āĻļāύ āĻļ⧁āϰ⧁ (S)">
+<!ENTITY restorepage.cancel.access  "S">
 
-<!ENTITY restorepage.restoreHeader "āĻĒ⧁āύāϰ⧁āĻĻā§āϧāĻžāϰ">
-<!ENTITY restorepage.listHeader "āωāχāĻ¨ā§āĻĄā§‹ āĻāĻŦāĻ‚ āĻŸā§āϝāĻžāĻŦ">
+<!ENTITY restorepage.restoreHeader  "āĻĒ⧁āύāϰ⧁āĻĻā§āϧāĻžāϰ">
+<!ENTITY restorepage.listHeader     "āωāχāĻ¨ā§āĻĄā§‹ āĻāĻŦāĻ‚ āĻŸā§āϝāĻžāĻŦ">
 <!-- LOCALIZATION NOTE: &#37;S will be replaced with a number. -->
-<!ENTITY restorepage.windowLabel "āωāχāĻ¨ā§āĻĄā§‹ &#37;S">
+<!ENTITY restorepage.windowLabel    "āωāχāĻ¨ā§āĻĄā§‹ &#37;S">
--- a/browser/chrome/browser/aboutSyncTabs.dtd
+++ b/browser/chrome/browser/aboutSyncTabs.dtd
@@ -1,17 +1,17 @@
 <!-- LOCALIZATION NOTE (tabs.otherComputers.label): Keep this in sync with syncTabsMenu.label from browser.dtd -->
-<!ENTITY tabs.otherComputers.label "āĻ…āĻ¨ā§āϝāĻžāĻ¨ā§āϝ āĻ•āĻŽā§āĻĒāĻŋāωāϟāĻžāϰ āĻĨ⧇āϕ⧇ āĻŸā§āϝāĻžāĻŦ">
+<!ENTITY tabs.otherComputers.label               "āĻ…āĻ¨ā§āϝāĻžāĻ¨ā§āϝ āĻ•āĻŽā§āĻĒāĻŋāωāϟāĻžāϰ āĻĨ⧇āϕ⧇ āĻŸā§āϝāĻžāĻŦ">
 
-<!ENTITY tabs.searchText.label "āĻŸā§āϝāĻžāĻŦ āϖ⧁āρāĻœā§‡ āĻĒ⧇āϤ⧇ āĻāĻ–āĻžāύ⧇ āϟāĻžāχāĻĒâ€Ļ">
+<!ENTITY tabs.searchText.label                   "āĻŸā§āϝāĻžāĻŦ āϖ⧁āρāĻœā§‡ āĻĒ⧇āϤ⧇ āĻāĻ–āĻžāύ⧇ āϟāĻžāχāĻĒâ€Ļ">
 <!-- LOCALIZATION NOTE (tabs.context.openTab.accesskey, tabs.context.openMultipleTabs.accesskey):
      Only one of these will show at a time (based on selection), so reusing accesskey is ok. -->
 
-<!ENTITY tabs.context.openTab.label "āĻ āĻŸā§āϝāĻžāĻŦ āϖ⧁āϞ⧁āύ (O)">
-<!ENTITY tabs.context.openTab.accesskey "O">
-<!ENTITY tabs.context.openMultipleTabs.label "āύāĻŋāĻ°ā§āĻŦāĻžāϚāĻŋāϤ āĻŸā§āϝāĻžāĻŦ āϖ⧁āϞ⧁āύ (O)">
-<!ENTITY tabs.context.openMultipleTabs.accesskey "O">
-<!ENTITY tabs.context.bookmarkSingleTab.label "āĻ āĻŸā§āϝāĻžāĻŦ āĻŦ⧁āĻ•āĻŽāĻžāĻ°ā§āĻ• āĻ•āϰ⧁āύâ€Ļ (B)">
-<!ENTITY tabs.context.bookmarkSingleTab.accesskey "B">
-<!ENTITY tabs.context.bookmarkMultipleTabs.label "āύāĻŋāĻ°ā§āĻŦāĻžāϚāĻŋāϤ āĻŸā§āϝāĻžāĻŦ āĻŦ⧁āĻ•āĻŽāĻžāĻ°ā§āĻ•â€Ļ (B)">
-<!ENTITY tabs.context.bookmarkMultipleTabs.accesskey "B">
-<!ENTITY tabs.context.refreshList.label "āϤāĻžāϞāĻŋāĻ•āĻž āϰāĻŋāĻĢā§āϰ⧇āĻļ (R)">
-<!ENTITY tabs.context.refreshList.accesskey "R">
+<!ENTITY tabs.context.openTab.label                   "āĻ āĻŸā§āϝāĻžāĻŦ āϖ⧁āϞ⧁āύ (O)">
+<!ENTITY tabs.context.openTab.accesskey               "O">
+<!ENTITY tabs.context.openMultipleTabs.label          "āύāĻŋāĻ°ā§āĻŦāĻžāϚāĻŋāϤ āĻŸā§āϝāĻžāĻŦ āϖ⧁āϞ⧁āύ (O)">
+<!ENTITY tabs.context.openMultipleTabs.accesskey      "O">
+<!ENTITY tabs.context.bookmarkSingleTab.label         "āĻ āĻŸā§āϝāĻžāĻŦ āĻŦ⧁āĻ•āĻŽāĻžāĻ°ā§āĻ• āĻ•āϰ⧁āύâ€Ļ (B)">
+<!ENTITY tabs.context.bookmarkSingleTab.accesskey     "B">
+<!ENTITY tabs.context.bookmarkMultipleTabs.label      "āύāĻŋāĻ°ā§āĻŦāĻžāϚāĻŋāϤ āĻŸā§āϝāĻžāĻŦ āĻŦ⧁āĻ•āĻŽāĻžāĻ°ā§āĻ•â€Ļ (B)">
+<!ENTITY tabs.context.bookmarkMultipleTabs.accesskey  "B">
+<!ENTITY tabs.context.refreshList.label               "āϤāĻžāϞāĻŋāĻ•āĻž āϰāĻŋāĻĢā§āϰ⧇āĻļ (R)">
+<!ENTITY tabs.context.refreshList.accesskey           "R">
--- a/browser/chrome/browser/baseMenuOverlay.dtd
+++ b/browser/chrome/browser/baseMenuOverlay.dtd
@@ -1,38 +1,38 @@
-<!ENTITY minimizeWindow.key "m">
-<!ENTITY minimizeWindow.label "āϛ⧋āϟ āĻ•āϰāĻž">
-<!ENTITY bringAllToFront.label "āϏāĻŦ āϏāĻžāĻŽāύ⧇ āφāύāĻž āĻšāĻŦ⧇">
-<!ENTITY zoomWindow.label "āĻŦ⧜ āφāĻ•āĻžāϰ⧇ āĻĒā§āϰāĻĻāĻ°ā§āĻļāύ">
-<!ENTITY windowMenu.label "āωāχāĻ¨ā§āĻĄā§‹">
+<!ENTITY minimizeWindow.key       "m">
+<!ENTITY minimizeWindow.label     "āϛ⧋āϟ āĻ•āϰāĻž">
+<!ENTITY bringAllToFront.label    "āϏāĻŦ āϏāĻžāĻŽāύ⧇ āφāύāĻž āĻšāĻŦ⧇">
+<!ENTITY zoomWindow.label         "āĻŦ⧜ āφāĻ•āĻžāϰ⧇ āĻĒā§āϰāĻĻāĻ°ā§āĻļāύ">
+<!ENTITY windowMenu.label         "āωāχāĻ¨ā§āĻĄā§‹">
 
-<!ENTITY helpMenu.label "āϏāĻšāĻžā§ŸāϤāĻž (H)">
-<!ENTITY helpMenu.accesskey "H">
+<!ENTITY helpMenu.label           "āϏāĻšāĻžā§ŸāϤāĻž (H)">
+<!ENTITY helpMenu.accesskey       "H">
 <!-- LOCALIZATION NOTE some localizations of Windows (ex:french, german) use "?"
                        for the help button in the menubar but Gnome does not.   -->
-<!ENTITY helpMenuWin.label "āϏāĻšāĻžā§ŸāϤāĻž (H)">
-<!ENTITY helpMenuWin.accesskey "H">
-<!ENTITY aboutProduct.label "&brandShortName; āĻĒāϰāĻŋāϚāĻŋāϤāĻŋ">
-<!ENTITY aboutProduct.accesskey "A">
-<!ENTITY productHelp.label "&brandShortName; āϏāĻšāĻžā§ŸāϤāĻž (H)">
-<!ENTITY productHelp.accesskey "H">
-<!ENTITY helpMac.commandkey "?">
-<!ENTITY helpSafeMode.label "āύāĻŋāĻ¸ā§āĻ•ā§āϰāĻŋ⧟ āĻ…ā§āϝāĻžāĻĄ-āĻ…āύāϏāĻš āĻĒ⧁āύāϰāĻžā§Ÿ āĻļ⧁āϰ⧁â€Ļ (R)">
-<!ENTITY helpSafeMode.accesskey "R">
+<!ENTITY helpMenuWin.label        "āϏāĻšāĻžā§ŸāϤāĻž (H)">
+<!ENTITY helpMenuWin.accesskey    "H">
+<!ENTITY aboutProduct.label       "&brandShortName; āĻĒāϰāĻŋāϚāĻŋāϤāĻŋ">
+<!ENTITY aboutProduct.accesskey   "A">
+<!ENTITY productHelp.label        "&brandShortName; āϏāĻšāĻžā§ŸāϤāĻž (H)">
+<!ENTITY productHelp.accesskey    "H">
+<!ENTITY helpMac.commandkey       "?">
+<!ENTITY helpSafeMode.label       "āύāĻŋāĻ¸ā§āĻ•ā§āϰāĻŋ⧟ āĻ…ā§āϝāĻžāĻĄ-āĻ…āύāϏāĻš āĻĒ⧁āύāϰāĻžā§Ÿ āĻļ⧁āϰ⧁â€Ļ (R)">
+<!ENTITY helpSafeMode.accesskey   "R">
 
-<!ENTITY helpTroubleshootingInfo.label "āϏāĻŽāĻžāϧāĻžāύ āĻ•āϰāĻžāϰ āϤāĻĨā§āϝ (T)">
-<!ENTITY helpTroubleshootingInfo.accesskey "T">
+<!ENTITY helpTroubleshootingInfo.label      "āϏāĻŽāĻžāϧāĻžāύ āĻ•āϰāĻžāϰ āϤāĻĨā§āϝ (T)">
+<!ENTITY helpTroubleshootingInfo.accesskey  "T">
 
-<!ENTITY helpFeedbackPage.label "āĻŽāĻ¨ā§āϤāĻŦā§āϝ āĻĒā§āϰāĻĻāĻžāύâ€Ļ (S)">
-<!ENTITY helpFeedbackPage.accesskey "S">
+<!ENTITY helpFeedbackPage.label      "āĻŽāĻ¨ā§āϤāĻŦā§āϝ āĻĒā§āϰāĻĻāĻžāύâ€Ļ (S)">
+<!ENTITY helpFeedbackPage.accesskey  "S">
 
-<!ENTITY preferencesCmdMac.label "āĻĒāĻ›āĻ¨ā§āĻĻāϏāĻŽā§‚āĻš...">
-<!ENTITY preferencesCmdMac.commandkey ",">
+<!ENTITY preferencesCmdMac.label        "āĻĒāĻ›āĻ¨ā§āĻĻāϏāĻŽā§‚āĻš...">
+<!ENTITY preferencesCmdMac.commandkey   ",">
 
-<!ENTITY servicesMenuMac.label "āϏ⧇āĻŦāĻž">
+<!ENTITY servicesMenuMac.label          "āϏ⧇āĻŦāĻž">
 
-<!ENTITY hideThisAppCmdMac.label "&brandShortName; āĻ†ā§œāĻžāϞ āĻ•āϰāĻž āĻšāĻŦ⧇ (H)">
-<!ENTITY hideThisAppCmdMac.commandkey "H">
+<!ENTITY hideThisAppCmdMac.label        "&brandShortName; āĻ†ā§œāĻžāϞ āĻ•āϰāĻž āĻšāĻŦ⧇ (H)">
+<!ENTITY hideThisAppCmdMac.commandkey   "H">
 
-<!ENTITY hideOtherAppsCmdMac.label "āĻ…āĻ¨ā§āϝāĻžāĻ¨ā§āϝ āωāχāĻ¨ā§āĻĄā§‹ āĻ†ā§œāĻžāϞ āĻ•āϰāĻž āĻšāĻŦ⧇">
+<!ENTITY hideOtherAppsCmdMac.label      "āĻ…āĻ¨ā§āϝāĻžāĻ¨ā§āϝ āωāχāĻ¨ā§āĻĄā§‹ āĻ†ā§œāĻžāϞ āĻ•āϰāĻž āĻšāĻŦ⧇">
 <!ENTITY hideOtherAppsCmdMac.commandkey "H">
 
-<!ENTITY showAllAppsCmdMac.label "āϏāĻŦ āĻĒā§āϰāĻĻāĻ°ā§āĻļāύ">
+<!ENTITY showAllAppsCmdMac.label        "āϏāĻŦ āĻĒā§āϰāĻĻāĻ°ā§āĻļāύ">
--- a/browser/chrome/browser/browser.dtd
+++ b/browser/chrome/browser/browser.dtd
@@ -7,45 +7,45 @@
 <!ENTITY mainWindow.titlemodifier "&brandFullName;">
 <!-- LOCALIZATION NOTE (mainWindow.titlemodifiermenuseparator): DONT_TRANSLATE -->
 <!ENTITY mainWindow.titlemodifiermenuseparator " - ">
 <!-- LOCALIZATION NOTE (mainWindow.titlePrivateBrowsingSuffix): This will be appended to the window's title
                                                                 inside the private browsing mode -->
 <!ENTITY mainWindow.titlePrivateBrowsingSuffix "(āĻāĻ•āĻžāĻ¨ā§āϤ āĻŦā§āϰāĻžāωāϜāĻŋāĻ‚)">
 <!-- Tab context menu -->
 
-<!ENTITY reloadTab.label "āĻŸā§āϝāĻžāĻŦ āĻĒ⧁āύāϰāĻžā§Ÿ āϞ⧋āĻĄ (R)">
-<!ENTITY reloadTab.accesskey "R">
-<!ENTITY reloadAllTabs.label "āϏāĻŦ āĻŸā§āϝāĻžāĻŦ āĻĒ⧁āύāϰāĻžā§Ÿ āϞ⧋āĻĄ (A)">
-<!ENTITY reloadAllTabs.accesskey "A">
-<!ENTITY closeOtherTabs.label "āĻ…āĻ¨ā§āϝāĻžāĻ¨ā§āϝ āĻŸā§āϝāĻžāĻŦ āĻŦāĻ¨ā§āϧ (O)">
-<!ENTITY closeOtherTabs.accesskey "O">
+<!ENTITY  reloadTab.label                    "āĻŸā§āϝāĻžāĻŦ āĻĒ⧁āύāϰāĻžā§Ÿ āϞ⧋āĻĄ (R)">
+<!ENTITY  reloadTab.accesskey                "R">
+<!ENTITY  reloadAllTabs.label                "āϏāĻŦ āĻŸā§āϝāĻžāĻŦ āĻĒ⧁āύāϰāĻžā§Ÿ āϞ⧋āĻĄ (A)">
+<!ENTITY  reloadAllTabs.accesskey            "A">
+<!ENTITY  closeOtherTabs.label               "āĻ…āĻ¨ā§āϝāĻžāĻ¨ā§āϝ āĻŸā§āϝāĻžāĻŦ āĻŦāĻ¨ā§āϧ (O)">
+<!ENTITY  closeOtherTabs.accesskey           "O">
 <!-- LOCALIZATION NOTE (pinAppTab.label, unpinAppTab.label): "Pin" is being
 used as a metaphor for expressing the fact that these tabs are "pinned" to the
 left edge of the tabstrip. Really we just want the string to express the idea
 that this is a lightweight and reversible action that keeps your tab where you
 can reach it easily. -->
 
-<!ENTITY pinAppTab.label "āĻ…ā§āϝāĻžāĻĒā§āϞāĻŋāϕ⧇āĻļāύ āĻŸā§āϝāĻžāĻŦ āĻšāĻŋāϏāĻžāĻŦ⧇ āĻĒāĻŋāύ (P)">
-<!ENTITY pinAppTab.accesskey "P">
-<!ENTITY unpinAppTab.label "āĻŸā§āϝāĻžāĻŦ āφāύāĻĒāĻŋāύ (b)">
-<!ENTITY unpinAppTab.accesskey "b">
-<!ENTITY moveToGroup.label "āĻ—ā§āϰ⧁āĻĒ⧇ āĻ¸ā§āĻĨāĻžāύāĻžāĻ¨ā§āϤāϰ (M)">
-<!ENTITY moveToGroup.accesskey "M">
-<!ENTITY moveToNewGroup.label "āύāϤ⧁āύ āĻ—ā§āϰ⧁āĻĒ">
-<!ENTITY moveToNewWindow.label "āύāϤ⧁āύ āωāχāĻ¨ā§āĻĄā§‹āϤ⧇ āĻ¸ā§āĻĨāĻžāύāĻžāĻ¨ā§āϤāϰ (W)">
-<!ENTITY moveToNewWindow.accesskey "W">
-<!ENTITY bookmarkAllTabs.label "āϏāĻŦ āĻŸā§āϝāĻžāĻŦ āĻŦ⧁āĻ•āĻŽāĻžāĻ°ā§āĻ• āĻ•āϰāĻžâ€Ļ (T)">
-<!ENTITY bookmarkAllTabs.accesskey "T">
-<!ENTITY undoCloseTab.label "āĻŸā§āϝāĻžāĻŦ āĻŦāĻ¨ā§āϧ āĻ•āϰāĻž āĻĨ⧇āϕ⧇ āĻĒā§‚āĻ°ā§āĻŦāĻžāĻŦāĻ¸ā§āĻĨāĻžā§Ÿ āĻĢāĻŋāϰ⧇ āϝāĻžāĻ“ā§ŸāĻž (U)">
-<!ENTITY undoCloseTab.accesskey "U">
-<!ENTITY closeTab.label "āĻŸā§āϝāĻžāĻŦ āĻŦāĻ¨ā§āϧ (C)">
-<!ENTITY closeTab.accesskey "C">
+<!ENTITY  pinAppTab.label                    "āĻ…ā§āϝāĻžāĻĒā§āϞāĻŋāϕ⧇āĻļāύ āĻŸā§āϝāĻžāĻŦ āĻšāĻŋāϏāĻžāĻŦ⧇ āĻĒāĻŋāύ (P)">
+<!ENTITY  pinAppTab.accesskey                "P">
+<!ENTITY  unpinAppTab.label                  "āĻŸā§āϝāĻžāĻŦ āφāύāĻĒāĻŋāύ (b)">
+<!ENTITY  unpinAppTab.accesskey              "b">
+<!ENTITY  moveToGroup.label                  "āĻ—ā§āϰ⧁āĻĒ⧇ āĻ¸ā§āĻĨāĻžāύāĻžāĻ¨ā§āϤāϰ (M)">
+<!ENTITY  moveToGroup.accesskey              "M">
+<!ENTITY  moveToNewGroup.label               "āύāϤ⧁āύ āĻ—ā§āϰ⧁āĻĒ">
+<!ENTITY  moveToNewWindow.label              "āύāϤ⧁āύ āωāχāĻ¨ā§āĻĄā§‹āϤ⧇ āĻ¸ā§āĻĨāĻžāύāĻžāĻ¨ā§āϤāϰ (W)">
+<!ENTITY  moveToNewWindow.accesskey          "W">
+<!ENTITY  bookmarkAllTabs.label              "āϏāĻŦ āĻŸā§āϝāĻžāĻŦ āĻŦ⧁āĻ•āĻŽāĻžāĻ°ā§āĻ• āĻ•āϰāĻžâ€Ļ (T)">
+<!ENTITY  bookmarkAllTabs.accesskey          "T">
+<!ENTITY  undoCloseTab.label                 "āĻŸā§āϝāĻžāĻŦ āĻŦāĻ¨ā§āϧ āĻ•āϰāĻž āĻĨ⧇āϕ⧇ āĻĒā§‚āĻ°ā§āĻŦāĻžāĻŦāĻ¸ā§āĻĨāĻžā§Ÿ āĻĢāĻŋāϰ⧇ āϝāĻžāĻ“ā§ŸāĻž (U)">
+<!ENTITY  undoCloseTab.accesskey             "U">
+<!ENTITY  closeTab.label                     "āĻŸā§āϝāĻžāĻŦ āĻŦāĻ¨ā§āϧ (C)">
+<!ENTITY  closeTab.accesskey                 "C">
 
-<!ENTITY listAllTabs.label "āϏāĻŦ āĻŸā§āϝāĻžāĻŦ⧇āϰ āϤāĻžāϞāĻŋāĻ•āĻž">
+<!ENTITY  listAllTabs.label      "āϏāĻŦ āĻŸā§āϝāĻžāĻŦ⧇āϰ āϤāĻžāϞāĻŋāĻ•āĻž">
 
 <!ENTITY tabCmd.label "āύāϤ⧁āύ āĻŸā§āϝāĻžāĻŦ (T)">
 <!ENTITY tabCmd.accesskey "T">
 <!ENTITY tabCmd.commandkey "t">
 <!ENTITY openLocationCmd.label "āύāϤ⧁āύ āĻ āĻŋāĻ•āĻžāύāĻžâ€Ļ (L)">
 <!ENTITY openLocationCmd.accesskey "L">
 <!ENTITY openFileCmd.label "āĻĢāĻžāχāϞ āϖ⧁āϞ⧁āύâ€Ļ (O)">
 <!ENTITY openFileCmd.accesskey "O">
@@ -66,17 +66,17 @@ can reach it easily. -->
 <!ENTITY menubarCmd.label "āĻŽā§‡āύ⧁ āĻŦāĻžāϰ (M)">
 <!ENTITY menubarCmd.accesskey "M">
 <!ENTITY navbarCmd.label "āĻ¨ā§āϝāĻžāĻ­āĻŋāϗ⧇āĻļāύ āϟ⧁āϞāĻŦāĻžāϰ (N)">
 <!ENTITY navbarCmd.accesskey "N">
 <!ENTITY personalbarCmd.label "āĻŦ⧁āĻ•āĻŽāĻžāĻ°ā§āĻ• āϟ⧁āϞāĻŦāĻžāϰ (B)">
 <!ENTITY personalbarCmd.accesskey "B">
 <!ENTITY bookmarksToolbarItem.label "āĻŦ⧁āĻ•āĻŽāĻžāĻ°ā§āĻ• āϟ⧁āϞāĻŦāĻžāϰ⧇āϰ āφāχāĻŸā§‡āĻŽ">
 <!ENTITY addonBarCmd.label "āĻ…ā§āϝāĻžāĻĄ-āĻ…āύ āĻŦāĻžāϰ">
-<!ENTITY addonBarCmd.accesskey "B">
+<!ENTITY addonBarCmd.accesskey "A">
 
 <!ENTITY pageSourceCmd.label "āĻĒ⧃āĻˇā§āĻ āĻžāϰ āϏ⧋āĻ°ā§āϏ (o)">
 <!ENTITY pageSourceCmd.accesskey "o">
 <!ENTITY pageSourceCmd.commandkey "u">
 <!ENTITY pageInfoCmd.label "āĻĒ⧃āĻˇā§āĻ āĻž āϏāĻ‚āĻ•ā§āϰāĻžāĻ¨ā§āϤ āϤāĻĨā§āϝ (I)">
 <!ENTITY pageInfoCmd.accesskey "I">
 <!ENTITY pageInfoCmd.commandkey "i">
 <!ENTITY fullScreenCmd.label "āĻĒāĻ°ā§āĻĻāĻžāĻœā§ā§œā§‡ āĻĒā§āϰāĻĻāĻ°ā§āĻļāύ (F)">
@@ -99,176 +99,197 @@ can reach it easily. -->
 <!ENTITY bookmarksMenu.label "āĻŦ⧁āĻ•āĻŽāĻžāĻ°ā§āĻ• (B)">
 <!ENTITY bookmarksMenu.accesskey "B">
 <!ENTITY bookmarkThisPageCmd.label "āĻāχ āĻĒ⧃āĻˇā§āĻ āĻž āĻŦ⧁āĻ•āĻŽāĻžāĻ°ā§āĻ• āĻ•āϰāĻž āĻšāĻŦ⧇">
 <!ENTITY bookmarkThisPageCmd.commandkey "d">
 <!ENTITY subscribeToPageMenupopup.label "āĻāχ āĻĒ⧃āĻˇā§āĻ āĻžā§Ÿ āϏāĻžāĻŦāĻ¸ā§āĻ•ā§āϰāĻžāχāĻŦ āĻ•āϰāĻž āĻšāĻŦ⧇">
 <!ENTITY subscribeToPageMenuitem.label "āĻāχ āĻĒ⧃āĻˇā§āĻ āĻžā§Ÿ āϏāĻžāĻŦāĻ¸ā§āĻ•ā§āϰāĻžāχāĻŦ āĻ•āϰāĻž āĻšāĻŦ⧇â€Ļ">
 <!ENTITY addCurPagesCmd.label "āϏāĻŦ āĻŸā§āϝāĻžāĻŦ āĻŦ⧁āĻ•āĻŽāĻžāĻ°ā§āĻ• āĻ•āϰāĻž āĻšāĻŦ⧇â€Ļ">
 <!ENTITY showAllBookmarks2.label "āϏāĻŦ āĻŦ⧁āĻ•āĻŽāĻžāĻ°ā§āĻ• āĻĒā§āϰāĻĻāĻ°ā§āĻļāύ">
-<!ENTITY bookmarkAllCmd.label "āϏāĻŦ āĻŸā§āϝāĻžāĻŦ āĻŦ⧁āĻ•āĻŽāĻžāĻ°ā§āĻ• āĻ•āϰāĻž āĻšāĻŦ⧇â€Ļ">
+<!ENTITY unsortedBookmarksCmd.label "Unsorted Bookmarks">
 <!ENTITY bookmarksToolbarChevron.tooltip "āφāϰāĻ“ āĻŦ⧁āĻ•āĻŽāĻžāĻ°ā§āĻ• āĻĒā§āϰāĻĻāĻ°ā§āĻļāύ">
 
-<!ENTITY backCmd.label "āĻĒā§‚āĻ°ā§āĻŦāĻŦāĻ°ā§āϤ⧀ (B)">
-<!ENTITY backCmd.accesskey "B">
-<!ENTITY backButton.tooltip "āĻĒā§‚āĻ°ā§āĻŦāĻŦāĻ°ā§āϤ⧀ āĻĒ⧃āĻˇā§āĻ āĻžā§Ÿ āĻĢāĻŋāϰ⧇ āϝāĻžāύ">
-<!ENTITY forwardCmd.label "āĻĒāϰāĻŦāĻ°ā§āϤ⧀ (F)">
-<!ENTITY forwardCmd.accesskey "F">
-<!ENTITY forwardButton.tooltip "āĻĒāϰāĻŦāĻ°ā§āϤ⧀ āĻĒ⧃āĻˇā§āĻ āĻžā§Ÿ āĻāĻ—āĻŋā§Ÿā§‡ āϝāĻžāύ">
-<!ENTITY reloadCmd.label "āĻĒ⧁āύāϰāĻžā§Ÿ āϞ⧋āĻĄ (R)">
-<!ENTITY reloadCmd.accesskey "R">
-<!ENTITY reloadButton.tooltip "āĻŦāĻ°ā§āϤāĻŽāĻžāύ āĻĒ⧃āĻˇā§āĻ āĻž āĻĒ⧁āύāϰāĻžā§Ÿ āϞ⧋āĻĄ">
-<!ENTITY stopCmd.label "āĻ¸ā§āĻĨāĻ—āĻŋāϤ (S)">
-<!ENTITY stopCmd.accesskey "S">
-<!ENTITY stopCmd.macCommandKey ".">
-<!ENTITY stopButton.tooltip "āĻĒ⧃āĻˇā§āĻ āĻž āϞ⧋āĻĄ āĻ•āϰāĻž āĻ¸ā§āĻĨāĻ—āĻŋāϤ āĻ•āϰāĻž āĻšāĻŦ⧇">
-<!ENTITY goEndCap.tooltip "āĻ āĻŋāĻ•āĻžāύāĻžāϰ āĻŦāĻžāϰ⧇ āωāĻ˛ā§āϞ⧇āĻ–āĻŋāϤ āĻĒ⧃āĻˇā§āĻ āĻž āĻĒā§āϰāĻĻāĻ°ā§āĻļāύ āĻ•āϰāĻž āĻšāĻŦ⧇">
-<!ENTITY printButton.label "āĻŽā§āĻĻā§āϰāĻŖ">
-<!ENTITY printButton.tooltip "āĻāχ āĻĒ⧃āĻˇā§āĻ āĻž āĻŽā§āĻĻā§āϰāĻŖ">
+<!ENTITY backCmd.label                "āĻĒā§‚āĻ°ā§āĻŦāĻŦāĻ°ā§āϤ⧀ (B)">
+<!ENTITY backCmd.accesskey            "B">
+<!ENTITY backButton.tooltip           "āĻĒā§‚āĻ°ā§āĻŦāĻŦāĻ°ā§āϤ⧀ āĻĒ⧃āĻˇā§āĻ āĻžā§Ÿ āĻĢāĻŋāϰ⧇ āϝāĻžāύ">
+<!ENTITY forwardCmd.label             "āĻĒāϰāĻŦāĻ°ā§āϤ⧀ (F)">
+<!ENTITY forwardCmd.accesskey         "F">
+<!ENTITY forwardButton.tooltip        "āĻĒāϰāĻŦāĻ°ā§āϤ⧀ āĻĒ⧃āĻˇā§āĻ āĻžā§Ÿ āĻāĻ—āĻŋā§Ÿā§‡ āϝāĻžāύ">
+<!ENTITY reloadCmd.label              "āĻĒ⧁āύāϰāĻžā§Ÿ āϞ⧋āĻĄ (R)">
+<!ENTITY reloadCmd.accesskey          "R">
+<!ENTITY reloadButton.tooltip         "āĻŦāĻ°ā§āϤāĻŽāĻžāύ āĻĒ⧃āĻˇā§āĻ āĻž āĻĒ⧁āύāϰāĻžā§Ÿ āϞ⧋āĻĄ">
+<!ENTITY stopCmd.label                "āĻ¸ā§āĻĨāĻ—āĻŋāϤ (S)">
+<!ENTITY stopCmd.accesskey            "S">
+<!ENTITY stopCmd.macCommandKey        ".">
+<!ENTITY stopButton.tooltip           "āĻĒ⧃āĻˇā§āĻ āĻž āϞ⧋āĻĄ āĻ•āϰāĻž āĻ¸ā§āĻĨāĻ—āĻŋāϤ āĻ•āϰāĻž āĻšāĻŦ⧇">
+<!ENTITY goEndCap.tooltip             "āĻ āĻŋāĻ•āĻžāύāĻžāϰ āĻŦāĻžāϰ⧇ āωāĻ˛ā§āϞ⧇āĻ–āĻŋāϤ āĻĒ⧃āĻˇā§āĻ āĻž āĻĒā§āϰāĻĻāĻ°ā§āĻļāύ āĻ•āϰāĻž āĻšāĻŦ⧇">
+<!ENTITY printButton.label            "āĻŽā§āĻĻā§āϰāĻŖ">
+<!ENTITY printButton.tooltip          "āĻāχ āĻĒ⧃āĻˇā§āĻ āĻž āĻŽā§āĻĻā§āϰāĻŖ">
 
-<!ENTITY backForwardItem.title "āĻĒā§‚āĻ°ā§āĻŦāĻŦāĻ°ā§āϤ⧀/āĻĒāϰāĻŦāĻ°ā§āϤ⧀">
-<!ENTITY locationItem.title "āĻ…āĻŦāĻ¸ā§āĻĨāĻžāύ">
-<!ENTITY searchItem.title "āĻ…āύ⧁āϏāĻ¨ā§āϧāĻžāύ">
-<!ENTITY throbberItem.title "āĻŦā§āϝāĻ¸ā§āϤāϚāĻŋāĻšā§āύ">
-<!ENTITY bookmarksItem.title "āĻŦ⧁āĻ•āĻŽāĻžāĻ°ā§āĻ•">
+<!ENTITY backForwardItem.title        "āĻĒā§‚āĻ°ā§āĻŦāĻŦāĻ°ā§āϤ⧀/āĻĒāϰāĻŦāĻ°ā§āϤ⧀">
+<!ENTITY locationItem.title           "āĻ…āĻŦāĻ¸ā§āĻĨāĻžāύ">
+<!ENTITY searchItem.title             "āĻ…āύ⧁āϏāĻ¨ā§āϧāĻžāύ">
+<!ENTITY throbberItem.title           "āĻŦā§āϝāĻ¸ā§āϤāϚāĻŋāĻšā§āύ">
+<!ENTITY bookmarksItem.title          "āĻŦ⧁āĻ•āĻŽāĻžāĻ°ā§āĻ•">
 <!-- Toolbar items --> 
 
-<!ENTITY appMenuButton.label "āĻŽā§‡āύ⧁">
-<!ENTITY appMenuButton.tooltip "&brandShortName;āĻŽā§‡āύ⧁ āϖ⧁āϞ⧁āύ ">
-<!ENTITY homeButton.label "āĻšā§‹āĻŽ">
+<!ENTITY appMenuButton.label          "āĻŽā§‡āύ⧁">
+<!ENTITY appMenuButton.tooltip        "&brandShortName;āĻŽā§‡āύ⧁ āϖ⧁āϞ⧁āύ ">
+<!ENTITY homeButton.label             "āĻšā§‹āĻŽ">
 
-<!ENTITY tabGroupsButton.label "āĻŸā§āϝāĻžāĻŦ āĻ—ā§āϰ⧁āĻĒ">
-<!ENTITY tabGroupsButton.tooltip "āφāĻĒāύāĻžāϰ āĻŸā§āϝāĻžāĻŦ⧇āϰ āĻ—ā§āϰ⧁āĻĒ">
+<!ENTITY tabGroupsButton.label        "āĻŸā§āϝāĻžāĻŦ āĻ—ā§āϰ⧁āĻĒ">
+<!ENTITY tabGroupsButton.tooltip      "āφāĻĒāύāĻžāϰ āĻŸā§āϝāĻžāĻŦ⧇āϰ āĻ—ā§āϰ⧁āĻĒ">
 
-<!ENTITY feedButton.label "āĻ—ā§āϰāĻžāĻšāĻ• āĻšāĻ“ā§ŸāĻž">
-<!ENTITY feedButton.tooltip "āĻāχ āĻĒ⧃āĻˇā§āĻ āĻžā§Ÿ āϏāĻžāĻŦāĻ¸ā§āĻ•ā§āϰāĻžāχāĻŦ āĻ•āϰ⧁āύâ€Ļ">
+<!ENTITY feedButton.label             "āĻ—ā§āϰāĻžāĻšāĻ• āĻšāĻ“ā§ŸāĻž">
+<!ENTITY feedButton.tooltip           "āĻāχ āĻĒ⧃āĻˇā§āĻ āĻžā§Ÿ āϏāĻžāĻŦāĻ¸ā§āĻ•ā§āϰāĻžāχāĻŦ āĻ•āϰ⧁āύâ€Ļ">
 
-<!ENTITY bookmarksButton.label "āĻŦ⧁āĻ•āĻŽāĻžāĻ°ā§āĻ• (B)">
-<!ENTITY bookmarksButton.tooltip "āφāĻĒāύāĻžāϰ āĻŦ⧁āĻ•āĻŽāĻžāĻ°ā§āĻ•āϗ⧁āϞ⧋ āĻĒā§āϰāĻĻāĻ°ā§āĻļāύ āĻ•āϰāĻž āĻšāĻŦ⧇">
-<!ENTITY bookmarksButton.accesskey "B">
+<!ENTITY bookmarksButton.label          "āĻŦ⧁āĻ•āĻŽāĻžāĻ°ā§āĻ• (B)">
+<!ENTITY bookmarksButton.tooltip        "āφāĻĒāύāĻžāϰ āĻŦ⧁āĻ•āĻŽāĻžāĻ°ā§āĻ•āϗ⧁āϞ⧋ āĻĒā§āϰāĻĻāĻ°ā§āĻļāύ āĻ•āϰāĻž āĻšāĻŦ⧇">
+<!ENTITY bookmarksButton.accesskey  "B">
 <!ENTITY bookmarksCmd.commandkey "b">
 
-<!ENTITY bookmarksMenuButton.label "āĻŦ⧁āĻ•āĻŽāĻžāĻ°ā§āĻ•">
-<!ENTITY bookmarksMenuButton.tooltip "āφāĻĒāύāĻžāϰ āĻŦ⧁āĻ•āĻŽāĻžāĻ°ā§āĻ• āĻĒā§āϰāĻĻāĻ°ā§āĻļāύ">
+<!ENTITY bookmarksMenuButton.label          "āĻŦ⧁āĻ•āĻŽāĻžāĻ°ā§āĻ•">
+<!ENTITY bookmarksMenuButton.tooltip        "āφāĻĒāύāĻžāϰ āĻŦ⧁āĻ•āĻŽāĻžāĻ°ā§āĻ• āĻĒā§āϰāĻĻāĻ°ā§āĻļāύ">
 <!ENTITY bookmarksMenuButton.unsorted.label "āĻ…āϏāĻ‚āϰāĻ•ā§āώāĻŋāϤ āĻŦ⧁āĻ•āĻŽāĻžāĻ°ā§āĻ•">
-<!ENTITY viewBookmarksSidebar.label "āϏāĻžāχāĻĄāĻŦāĻžāϰ⧇ āĻĒā§āϰāĻĻāĻ°ā§āĻļāύ">
-<!ENTITY viewBookmarksToolbar.label "āĻŦ⧁āĻ•āĻŽāĻžāĻ°ā§āĻ• āϟ⧁āϞāĻŦāĻžāϰ āĻĒā§āϰāĻĻāĻ°ā§āĻļāύ">
+<!ENTITY viewBookmarksSidebar.label         "āϏāĻžāχāĻĄāĻŦāĻžāϰ⧇ āĻĒā§āϰāĻĻāĻ°ā§āĻļāύ">
+<!ENTITY viewBookmarksToolbar.label         "āĻŦ⧁āĻ•āĻŽāĻžāĻ°ā§āĻ• āϟ⧁āϞāĻŦāĻžāϰ āĻĒā§āϰāĻĻāĻ°ā§āĻļāύ">
 <!-- LOCALIZATION NOTE (bookmarksSidebarGtkCmd.commandkey): This command
   -  key should not contain the letters A-F, since these are reserved
   -  shortcut keys on Linux. -->
 
 <!ENTITY bookmarksGtkCmd.commandkey "o">
 <!ENTITY bookmarksWinCmd.commandkey "i">
 
-<!ENTITY historyButton.label "āχāϤāĻŋāĻšāĻžāϏ">
-<!ENTITY historyButton.tooltip "āϏāĻŽā§āĻĒā§āϰāϤāĻŋ āĻĒāϰāĻŋāĻĻāĻ°ā§āĻļāĻŋāϤ āĻĒ⧃āĻˇā§āĻ āĻž āĻĒā§āϰāĻĻāĻ°ā§āĻļāύ āĻ•āϰāĻž āĻšāĻŦ⧇">
-<!ENTITY historySidebarCmd.accesskey "s">
-<!ENTITY historySidebarCmd.commandKey "h">
+<!ENTITY historyButton.label            "āχāϤāĻŋāĻšāĻžāϏ">
+<!ENTITY historyButton.tooltip          "āϏāĻŽā§āĻĒā§āϰāϤāĻŋ āĻĒāϰāĻŋāĻĻāĻ°ā§āĻļāĻŋāϤ āĻĒ⧃āĻˇā§āĻ āĻž āĻĒā§āϰāĻĻāĻ°ā§āĻļāύ āĻ•āϰāĻž āĻšāĻŦ⧇">
+<!ENTITY historySidebarCmd.accesskey    "s">
+<!ENTITY historySidebarCmd.commandKey   "h">
 
-<!ENTITY toolsMenu.label "āϟ⧁āϞ (T)">
-<!ENTITY toolsMenu.accesskey "T">
+<!ENTITY toolsMenu.label              "āϟ⧁āϞ (T)">
+<!ENTITY toolsMenu.accesskey          "T">
 
-<!ENTITY keywordfield.label "āĻ…āύ⧁āϏāĻ¨ā§āϧāĻžāύ⧇āϰ āϜāĻ¨ā§āϝ āϕ⧀āĻ“ā§ŸāĻžāĻ°ā§āĻĄ āϝ⧋āĻ— āĻ•āϰ⧁āύâ€Ļ (K)">
-<!ENTITY keywordfield.accesskey "K">
-<!ENTITY search.label "āĻ“ā§Ÿā§‡āĻŦ⧇ āĻ…āύ⧁āϏāĻ¨ā§āϧāĻžāύ (S)">
-<!ENTITY search.accesskey "S">
-<!ENTITY downloads.label "āĻĄāĻžāωāύāϞ⧋āĻĄ (D)">
-<!ENTITY downloads.tooltip "āĻĄāĻžāωāύāϞ⧋āĻĄā§‡āϰ āĻ…āĻ—ā§āϰāĻ—āϤāĻŋ āĻĒā§āϰāĻĻāĻ°ā§āĻļāύ">
-<!ENTITY downloads.accesskey "D">
-<!ENTITY downloads.commandkey "j">
-<!ENTITY downloadsUnix.commandkey "y">
-<!ENTITY addons.label "āĻ…ā§āϝāĻžāĻĄ-āĻ…āύ (A)">
-<!ENTITY addons.accesskey "A">
-<!ENTITY addons.commandkey "A">
+<!ENTITY keywordfield.label           "āĻ…āύ⧁āϏāĻ¨ā§āϧāĻžāύ⧇āϰ āϜāĻ¨ā§āϝ āϕ⧀āĻ“ā§ŸāĻžāĻ°ā§āĻĄ āϝ⧋āĻ— āĻ•āϰ⧁āύâ€Ļ (K)">
+<!ENTITY keywordfield.accesskey       "K">
+<!ENTITY search.label                 "āĻ“ā§Ÿā§‡āĻŦ⧇ āĻ…āύ⧁āϏāĻ¨ā§āϧāĻžāύ (S)">
+<!ENTITY search.accesskey             "S">
+<!ENTITY downloads.label              "āĻĄāĻžāωāύāϞ⧋āĻĄ (D)">
+<!ENTITY downloads.tooltip            "āĻĄāĻžāωāύāϞ⧋āĻĄā§‡āϰ āĻ…āĻ—ā§āϰāĻ—āϤāĻŋ āĻĒā§āϰāĻĻāĻ°ā§āĻļāύ">
+<!ENTITY downloads.accesskey          "D">
+<!ENTITY downloads.commandkey         "j">
+<!ENTITY downloadsUnix.commandkey     "y">
+<!ENTITY addons.label                 "āĻ…ā§āϝāĻžāĻĄ-āĻ…āύ (A)">
+<!ENTITY addons.accesskey             "A">
+<!ENTITY addons.commandkey            "A">
+
+<!ENTITY webDeveloperMenu.label       "Web Developer">
+<!ENTITY webDeveloperMenu.accesskey   "W">
+
+<!ENTITY errorConsoleCmd.label        "āĻ¤ā§āϰ⧁āϟāĻŋ āĻ•āύāϏ⧋āϞ (C)">
+<!ENTITY errorConsoleCmd.accesskey    "C">
+<!ENTITY errorConsoleCmd.commandkey   "j">
 
-<!ENTITY errorConsoleCmd.label "āĻ¤ā§āϰ⧁āϟāĻŋ āĻ•āύāϏ⧋āϞ (C)">
-<!ENTITY errorConsoleCmd.accesskey "C">
-<!ENTITY errorConsoleCmd.commandkey "j">
-
-<!ENTITY webConsoleCmd.label "āĻ“ā§Ÿā§‡āĻŦ āĻ•āύāϏ⧋āϞ (W)">
-<!ENTITY webConsoleCmd.accesskey "W">
-<!ENTITY webConsoleCmd.commandkey "k">
+<!ENTITY webConsoleCmd.label          "āĻ“ā§Ÿā§‡āĻŦ āĻ•āύāϏ⧋āϞ (W)">
+<!ENTITY webConsoleCmd.accesskey      "W">
+<!ENTITY webConsoleCmd.commandkey     "k">
 
-<!ENTITY inspectMenu.label "āĻĒāϰ⧀āĻ•ā§āώāĻž (t)">
-<!ENTITY inspectMenu.accesskey "t">
-<!ENTITY inspectMenu.commandkey "I">
+<!ENTITY inspectMenu.label            "āĻĒāϰ⧀āĻ•ā§āώāĻž (t)">
+<!ENTITY inspectMenu.accesskey        "t">
+<!ENTITY inspectMenu.commandkey       "I">
+<!-- LOCALIZATION NOTE (scratchpad.label): This menu item label appears
+  -  in the Tools menu. See bug 653093.
+  -  The Scratchpad is intended to provide a simple text editor for creating
+  -  and evaluating bits of JavaScript code for the purposes of function
+  -  prototyping, experimentation and convenient scripting.
+  -
+  -  It's quite possible that you won't have a good analogue for the word
+  -  "Scratchpad" in your locale. You should feel free to find a close
+  -  approximation to it or choose a word (or words) that means
+  -  "simple discardable text editor". -->
 
-<!ENTITY inspectPanelTitle.label "HTML">
-<!ENTITY inspectButton.label "āĻĒāϰ⧀āĻ•ā§āώāĻž (I)">
-<!ENTITY inspectButton.accesskey "I">
-<!ENTITY inspectNextButton.label "āĻĒāϰāĻŦāĻ°ā§āϤ⧀ (N)">
-<!ENTITY inspectNextButton.accesskey "N">
-<!ENTITY inspectPreviousButton.label "āĻĒā§‚āĻ°ā§āĻŦāĻŦāĻ°ā§āϤ⧀ (P)">
+<!ENTITY scratchpad.label             "Scratchpad">
+<!ENTITY scratchpad.accesskey         "s">
+<!ENTITY scratchpad.keycode           "VK_F4">
+<!ENTITY scratchpad.keytext           "F4">
+
+<!ENTITY inspectPanelTitle.label      "HTML">
+<!ENTITY inspectButton.label          "āĻĒāϰ⧀āĻ•ā§āώāĻž (I)">
+<!ENTITY inspectButton.accesskey      "I">
+<!ENTITY inspectNextButton.label      "āĻĒāϰāĻŦāĻ°ā§āϤ⧀ (N)">
+<!ENTITY inspectNextButton.accesskey  "N">
+<!ENTITY inspectPreviousButton.label  "āĻĒā§‚āĻ°ā§āĻŦāĻŦāĻ°ā§āϤ⧀ (P)">
 <!ENTITY inspectPreviousButton.accesskey "P">
-<!ENTITY inspectStyleButton.label "āĻļ⧈āϞ⧀ (S)">
+<!ENTITY inspectStyleButton.label     "āĻļ⧈āϞ⧀ (S)">
 <!ENTITY inspectStyleButton.accesskey "S">
-<!ENTITY inspectStylePanelTitle.label "āĻļ⧈āϞ⧀">
+<!ENTITY inspectStylePanelTitle.label  "āĻļ⧈āϞ⧀">
 <!-- LOCALIZATION NOTE (inspectObjectButton.label): This button label
   -  appears on the Inspector's toolbar. It is used to open and close the Object
   -  panel. There is also a label in inspector.properties for the panel
   -  titlebar: object.objectPanelTitle. -->
-<!ENTITY inspectObjectButton.label "āĻ…āĻŦāĻœā§‡āĻ•ā§āϟ (O)">
-<!ENTITY inspectObjectButton.accesskey "O">
+<!ENTITY inspectObjectButton.label       "āĻ…āĻŦāĻœā§‡āĻ•ā§āϟ (O)">
+<!ENTITY inspectObjectButton.accesskey   "O">
+
+<!ENTITY getMoreDevtoolsCmd.label        "Get More Tools">
+<!ENTITY getMoreDevtoolsCmd.accesskey    "M">
 
-<!ENTITY fileMenu.label "āĻĢāĻžāχāϞ (F)">
-<!ENTITY fileMenu.accesskey "F">
-<!ENTITY newNavigatorCmd.label "āύāϤ⧁āύ āωāχāĻ¨ā§āĻĄā§‹ (N)">
-<!ENTITY newNavigatorCmd.key "N">
-<!ENTITY newNavigatorCmd.accesskey "N">
+<!ENTITY fileMenu.label         "āĻĢāĻžāχāϞ (F)">
+<!ENTITY fileMenu.accesskey       "F">
+<!ENTITY newNavigatorCmd.label        "āύāϤ⧁āύ āωāχāĻ¨ā§āĻĄā§‹ (N)">
+<!ENTITY newNavigatorCmd.key        "N">
+<!ENTITY newNavigatorCmd.accesskey      "N">
 
-<!ENTITY editMenu.label "āϏāĻŽā§āĻĒāĻžāĻĻāύāĻž (E)">
-<!ENTITY editMenu.accesskey "E">
-<!ENTITY undoCmd.label "āĻĒā§‚āĻ°ā§āĻŦāĻžāĻŦāĻ¸ā§āĻĨāĻžā§Ÿ āĻĢāĻŋāϰāĻžāύ⧋ (U)">
-<!ENTITY undoCmd.key "Z">
-<!ENTITY undoCmd.accesskey "U">
-<!ENTITY redoCmd.label "āĻĒ⧁āύāϰāĻžā§Ÿ āĻ•āϰāĻž (R)">
-<!ENTITY redoCmd.key "Y">
-<!ENTITY redoCmd.accesskey "R">
-<!ENTITY cutCmd.label "āĻ•āĻžāϟāĻž (t)">
-<!ENTITY cutCmd.key "X">
-<!ENTITY cutCmd.accesskey "t">
-<!ENTITY copyCmd.label "āĻ…āύ⧁āϞāĻŋāĻĒāĻŋ (C)">
-<!ENTITY copyCmd.key "C">
-<!ENTITY copyCmd.accesskey "C">
-<!ENTITY pasteCmd.label "āĻĒā§āϰāϤāĻŋāϞ⧇āĻĒāύ (P)">
-<!ENTITY pasteCmd.key "V">
-<!ENTITY pasteCmd.accesskey "P">
-<!ENTITY deleteCmd.label "āĻŽā§āϛ⧇ āĻĢ⧇āϞ⧁āύ (D)">
-<!ENTITY deleteCmd.key "D">
-<!ENTITY deleteCmd.accesskey "D">
-<!ENTITY selectAllCmd.label "āϏāĻŦ āύāĻŋāĻ°ā§āĻŦāĻžāϚāύ (A)">
-<!ENTITY selectAllCmd.key "A">
-<!ENTITY selectAllCmd.accesskey "A">
-<!ENTITY preferencesCmd2.label "āĻ…āĻĒāĻļāύ (O)">
-<!ENTITY preferencesCmd2.accesskey "O">
-<!ENTITY preferencesCmdUnix.label "āĻĒāĻ›āĻ¨ā§āĻĻāϏāĻŽā§‚āĻš (n)">
-<!ENTITY preferencesCmdUnix.accesskey "n">
+<!ENTITY editMenu.label         "āϏāĻŽā§āĻĒāĻžāĻĻāύāĻž (E)">
+<!ENTITY editMenu.accesskey       "E">
+<!ENTITY undoCmd.label            "āĻĒā§‚āĻ°ā§āĻŦāĻžāĻŦāĻ¸ā§āĻĨāĻžā§Ÿ āĻĢāĻŋāϰāĻžāύ⧋ (U)">
+<!ENTITY undoCmd.key            "Z">
+<!ENTITY undoCmd.accesskey          "U">
+<!ENTITY redoCmd.label            "āĻĒ⧁āύāϰāĻžā§Ÿ āĻ•āϰāĻž (R)">
+<!ENTITY redoCmd.key            "Y">
+<!ENTITY redoCmd.accesskey          "R">
+<!ENTITY cutCmd.label           "āĻ•āĻžāϟāĻž (t)">
+<!ENTITY cutCmd.key             "X">
+<!ENTITY cutCmd.accesskey         "t">
+<!ENTITY copyCmd.label            "āĻ…āύ⧁āϞāĻŋāĻĒāĻŋ (C)">
+<!ENTITY copyCmd.key            "C">
+<!ENTITY copyCmd.accesskey          "C">
+<!ENTITY pasteCmd.label           "āĻĒā§āϰāϤāĻŋāϞ⧇āĻĒāύ (P)">
+<!ENTITY pasteCmd.key           "V">
+<!ENTITY pasteCmd.accesskey         "P">
+<!ENTITY deleteCmd.label          "āĻŽā§āϛ⧇ āĻĢ⧇āϞ⧁āύ (D)">
+<!ENTITY deleteCmd.key            "D">
+<!ENTITY deleteCmd.accesskey        "D">
+<!ENTITY selectAllCmd.label         "āϏāĻŦ āύāĻŋāĻ°ā§āĻŦāĻžāϚāύ (A)">
+<!ENTITY selectAllCmd.key         "A">
+<!ENTITY selectAllCmd.accesskey       "A">
+<!ENTITY preferencesCmd2.label       "āĻ…āĻĒāĻļāύ (O)">
+<!ENTITY preferencesCmd2.accesskey     "O">
+<!ENTITY preferencesCmdUnix.label       "āĻĒāĻ›āĻ¨ā§āĻĻāϏāĻŽā§‚āĻš (n)">
+<!ENTITY preferencesCmdUnix.accesskey     "n">
 
-<!ENTITY clearRecentHistory.label "āϏāĻžāĻŽā§āĻĒā§āϰāϤāĻŋāĻ• āχāϤāĻŋāĻšāĻžāϏ āĻ…āĻĒāϏāĻžāϰāĻŖâ€Ļ (H)">
-<!ENTITY clearRecentHistory.accesskey "H">
+<!ENTITY clearRecentHistory.label               "āϏāĻžāĻŽā§āĻĒā§āϰāϤāĻŋāĻ• āχāϤāĻŋāĻšāĻžāϏ āĻ…āĻĒāϏāĻžāϰāĻŖâ€Ļ (H)">
+<!ENTITY clearRecentHistory.accesskey           "H">
 <!-- LOCALIZATION NOTE : These two strings can share an access key beause they never appear together on the menu -->
 
-<!ENTITY privateBrowsingCmd.start.label "āĻāĻ•āĻžāĻ¨ā§āϤ āĻŦā§āϰāĻžāωāϜāĻŋāĻ‚ āĻļ⧁āϰ⧁ (P)">
-<!ENTITY privateBrowsingCmd.start.accesskey "P">
-<!ENTITY privateBrowsingCmd.stop.label "āĻāĻ•āĻžāĻ¨ā§āϤ āĻŦā§āϰāĻžāωāϜāĻŋāĻ‚ āĻŦāĻ¨ā§āϧ (P)">
-<!ENTITY privateBrowsingCmd.stop.accesskey "P">
-<!ENTITY privateBrowsingCmd.commandkey "P">
+<!ENTITY privateBrowsingCmd.start.label         "āĻāĻ•āĻžāĻ¨ā§āϤ āĻŦā§āϰāĻžāωāϜāĻŋāĻ‚ āĻļ⧁āϰ⧁ (P)">
+<!ENTITY privateBrowsingCmd.start.accesskey     "P">
+<!ENTITY privateBrowsingCmd.stop.label          "āĻāĻ•āĻžāĻ¨ā§āϤ āĻŦā§āϰāĻžāωāϜāĻŋāĻ‚ āĻŦāĻ¨ā§āϧ (P)">
+<!ENTITY privateBrowsingCmd.stop.accesskey      "P">
+<!ENTITY privateBrowsingCmd.commandkey          "P">
 
-<!ENTITY viewMenu.label "āĻĒā§āϰāĻĻāĻ°ā§āĻļāύ (V)">
-<!ENTITY viewMenu.accesskey "V">
-<!ENTITY viewTabGroups.label "āĻŸā§āϝāĻžāĻŦ āĻ—ā§āϰ⧁āĻĒ (G)">
-<!ENTITY viewTabGroups.accesskey "G">
-<!ENTITY viewToolbarsMenu.label "āϟ⧁āϞāĻŦāĻžāϰ (T)">
-<!ENTITY viewToolbarsMenu.accesskey "T">
+<!ENTITY viewMenu.label         "āĻĒā§āϰāĻĻāĻ°ā§āĻļāύ (V)">
+<!ENTITY viewMenu.accesskey       "V">
+<!ENTITY viewTabGroups.label            "āĻŸā§āϝāĻžāĻŦ āĻ—ā§āϰ⧁āĻĒ (G)">
+<!ENTITY viewTabGroups.accesskey        "G">
+<!ENTITY viewToolbarsMenu.label       "āϟ⧁āϞāĻŦāĻžāϰ (T)">
+<!ENTITY viewToolbarsMenu.accesskey     "T">
 <!ENTITY viewSidebarMenu.label "āϏāĻžāχāĻĄāĻŦāĻžāϰ (e)">
 <!ENTITY viewSidebarMenu.accesskey "e">
-<!ENTITY viewCustomizeToolbar.label "āĻ¸ā§āĻŦāύāĻŋāĻ°ā§āϧāĻžāϰāĻŖâ€Ļ (C)">
-<!ENTITY viewCustomizeToolbar.accesskey "C">
-<!ENTITY viewTabsOnTop.label "āĻļā§€āĻ°ā§āώ āĻŸā§āϝāĻžāĻŦ (T)">
-<!ENTITY viewTabsOnTop.accesskey "T">
+<!ENTITY viewCustomizeToolbar.label       "āĻ¸ā§āĻŦāύāĻŋāĻ°ā§āϧāĻžāϰāĻŖâ€Ļ (C)">
+<!ENTITY viewCustomizeToolbar.accesskey     "C">
+<!ENTITY viewTabsOnTop.label            "āĻļā§€āĻ°ā§āώ āĻŸā§āϝāĻžāĻŦ (T)">
+<!ENTITY viewTabsOnTop.accesskey        "T">
 
 <!ENTITY historyMenu.label "āχāϤāĻŋāĻšāĻžāϏ (s)">
 <!ENTITY historyMenu.accesskey "s">
 <!ENTITY historyUndoMenu.label "āϏāĻŽā§āĻĒā§āϰāϤāĻŋ āĻŦāĻ¨ā§āϧ āĻ•āϰāĻž āĻŸā§āϝāĻžāĻŦ">
 <!-- LOCALIZATION NOTE (historyUndoWindowMenu): see bug 394759 -->
 <!ENTITY historyUndoWindowMenu.label "āϏāĻŽā§āĻĒā§āϰāϤāĻŋ āĻŦāĻ¨ā§āϧ āĻ•āϰāĻž āωāχāĻ¨ā§āĻĄā§‹">
 <!ENTITY historyRestoreLastSession.label "āĻĒā§‚āĻ°ā§āĻŦāĻŦāĻ°ā§āϤ⧀ āϏ⧇āĻļāύ āĻĒ⧁āύāϰ⧁āĻĻā§āϧāĻžāϰ">
 
@@ -282,20 +303,20 @@ can reach it easily. -->
 <!ENTITY appMenuSidebars.label "āϏāĻžāχāĻĄāĻŦāĻžāϰ">
 <!ENTITY appMenuFind.label "āĻ–ā§‹āρāϜāĻžâ€Ļ">
 <!ENTITY appMenuUnsorted.label "āĻ…āĻ—ā§‹āĻ›āĻžāύ⧋ āĻŦ⧁āĻ•āĻŽāĻžāĻ°ā§āĻ•">
 <!ENTITY appMenuWebDeveloper.label "āĻ“ā§Ÿā§‡āĻŦ āĻĄā§‡āϭ⧇āϞāĻĒāĻžāϰ">
 <!ENTITY appMenuGettingStarted.label "āĻļ⧁āϰ⧁ āĻ•āϰāĻž āĻšāĻšā§āϛ⧇">
 <!ENTITY appMenuSafeMode.label "āύāĻŋāĻ¸ā§āĻ•ā§āϰāĻŋ⧟ āĻ…ā§āϝāĻžāĻĄ-āĻ…āύāϏāĻš āĻĒ⧁āύāϰāĻžā§Ÿ āĻļ⧁āϰ⧁â€Ļ(R)">
 <!ENTITY appMenuSafeMode.accesskey "R">
 
-<!ENTITY openCmd.commandkey "l">
-<!ENTITY urlbar.placeholder "āĻ“ā§Ÿā§‡āĻŦ āϏāĻžāχāĻŸā§‡ āϝāĻžāύ">
-<!ENTITY urlbar.accesskey "d">
-<!ENTITY urlbar.switchToTab.label "āĻŸā§āϝāĻžāĻŦ⧇ āϝāĻžāύ:">
+<!ENTITY openCmd.commandkey           "l">
+<!ENTITY urlbar.placeholder           "āĻ“ā§Ÿā§‡āĻŦ āϏāĻžāχāĻŸā§‡ āϝāĻžāύ">
+<!ENTITY urlbar.accesskey             "d">
+<!ENTITY urlbar.switchToTab.label     "āĻŸā§āϝāĻžāĻŦ⧇ āϝāĻžāύ:">
 <!-- 
   Comment duplicated from browser-sets.inc:
 
   Search Command Key Logic works like this:
 
   Unix: Ctrl+J (0.8, 0.9 support)
         Ctrl+K (cross platform binding)
   Mac:  Cmd+K (cross platform binding)
@@ -306,219 +327,219 @@ can reach it easily. -->
   our standard - it is a "safe" choice since it is near no harmful keys like "W" as
   "E" is. People mourning the loss of Ctrl+K for emacs compat can switch their GTK
   system setting to use emacs emulation, and we should respect it. Focus-Search-Box
   is a fundamental keybinding and we are maintaining a XP binding so that it is easy
   for people to switch to Linux.
 
  -->
 
-<!ENTITY searchFocus.commandkey "k">
-<!ENTITY searchFocusUnix.commandkey "j">
+<!ENTITY searchFocus.commandkey       "k">
+<!ENTITY searchFocusUnix.commandkey   "j">
 
-<!ENTITY tabView.commandkey "e">
+<!ENTITY tabView.commandkey           "e">
 
-<!ENTITY openLinkCmdInTab.label "āύāϤ⧁āύ āĻŸā§āϝāĻžāĻŦ⧇ āϞāĻŋāĻ‚āĻ• āĻ–ā§‹āϞāĻž āĻšāĻŦ⧇ (T)">
-<!ENTITY openLinkCmdInTab.accesskey "T">
-<!ENTITY openLinkCmd.label "āύāϤ⧁āύ āωāχāĻ¨ā§āĻĄā§‹āϤ⧇ āϞāĻŋāĻ‚āĻ• āĻ–ā§‹āϞāĻž āĻšāĻŦ⧇ (W)">
-<!ENTITY openLinkCmd.accesskey "W">
-<!ENTITY openLinkCmdInCurrent.label "Open Link">
+<!ENTITY openLinkCmdInTab.label       "āύāϤ⧁āύ āĻŸā§āϝāĻžāĻŦ⧇ āϞāĻŋāĻ‚āĻ• āĻ–ā§‹āϞāĻž āĻšāĻŦ⧇ (T)">
+<!ENTITY openLinkCmdInTab.accesskey   "T">
+<!ENTITY openLinkCmd.label            "āύāϤ⧁āύ āωāχāĻ¨ā§āĻĄā§‹āϤ⧇ āϞāĻŋāĻ‚āĻ• āĻ–ā§‹āϞāĻž āĻšāĻŦ⧇ (W)">
+<!ENTITY openLinkCmd.accesskey        "W">
+<!ENTITY openLinkCmdInCurrent.label     "Open Link">
 <!ENTITY openLinkCmdInCurrent.accesskey "O">
-<!ENTITY openFrameCmdInTab.label "āύāϤ⧁āύ āĻŸā§āϝāĻžāĻŦ⧇ āĻĢā§āϰ⧇āĻŽ āĻ–ā§‹āϞāĻž āĻšāĻŦ⧇ (T)">
-<!ENTITY openFrameCmdInTab.accesskey "T">
-<!ENTITY openFrameCmd.label "āύāϤ⧁āύ āωāχāĻ¨ā§āĻĄā§‹āϤ⧇ āĻĢā§āϰ⧇āĻŽ āĻ–ā§‹āϞāĻž āĻšāĻŦ⧇ (W)">
-<!ENTITY openFrameCmd.accesskey "W">
-<!ENTITY showOnlyThisFrameCmd.label "āĻļ⧁āϧ⧁āĻŽāĻžāĻ¤ā§āϰ āĻāχ āĻĢā§āϰ⧇āĻŽāϟāĻŋ āĻĒā§āϰāĻĻāĻ°ā§āĻļāύ āĻ•āϰāĻž āĻšāĻŦ⧇ (S)">
+<!ENTITY openFrameCmdInTab.label      "āύāϤ⧁āύ āĻŸā§āϝāĻžāĻŦ⧇ āĻĢā§āϰ⧇āĻŽ āĻ–ā§‹āϞāĻž āĻšāĻŦ⧇ (T)">
+<!ENTITY openFrameCmdInTab.accesskey  "T">
+<!ENTITY openFrameCmd.label           "āύāϤ⧁āύ āωāχāĻ¨ā§āĻĄā§‹āϤ⧇ āĻĢā§āϰ⧇āĻŽ āĻ–ā§‹āϞāĻž āĻšāĻŦ⧇ (W)">
+<!ENTITY openFrameCmd.accesskey       "W">
+<!ENTITY showOnlyThisFrameCmd.label     "āĻļ⧁āϧ⧁āĻŽāĻžāĻ¤ā§āϰ āĻāχ āĻĢā§āϰ⧇āĻŽāϟāĻŋ āĻĒā§āϰāĻĻāĻ°ā§āĻļāύ āĻ•āϰāĻž āĻšāĻŦ⧇ (S)">
 <!ENTITY showOnlyThisFrameCmd.accesskey "S">
-<!ENTITY reloadCmd.commandkey "r">
-<!ENTITY reloadFrameCmd.label "āĻĢā§āϰ⧇āĻŽ āĻĒ⧁āύāϰāĻžā§Ÿ āϞ⧋āĻĄ āĻ•āϰāĻž āĻšāĻŦ⧇ (R)">
-<!ENTITY reloadFrameCmd.accesskey "R">
+<!ENTITY reloadCmd.commandkey         "r">
+<!ENTITY reloadFrameCmd.label         "āĻĢā§āϰ⧇āĻŽ āĻĒ⧁āύāϰāĻžā§Ÿ āϞ⧋āĻĄ āĻ•āϰāĻž āĻšāĻŦ⧇ (R)">
+<!ENTITY reloadFrameCmd.accesskey     "R">
 <!ENTITY viewPartialSourceForSelectionCmd.label "āύāĻŋāĻ°ā§āĻŦāĻžāϚāĻŋāϤ āĻ…āĻ‚āĻļ⧇āϰ āϏ⧋āĻ°ā§āϏ āĻĒā§āϰāĻĻāĻ°ā§āĻļāύ">
-<!ENTITY viewPartialSourceForMathMLCmd.label "MathML āϏ⧋āĻ°ā§āϏ āĻĒā§āϰāĻĻāĻ°ā§āĻļāύ">
+<!ENTITY viewPartialSourceForMathMLCmd.label    "MathML āϏ⧋āĻ°ā§āϏ āĻĒā§āϰāĻĻāĻ°ā§āĻļāύ">
 <!-- LOCALIZATION NOTE (viewPartialSourceCmd.accesskey): This accesskey is used for both 
          viewPartialSourceForSelectionCmd.label and viewPartialSourceForMathMLCmd.label -->
 <!ENTITY viewPartialSourceCmd.accesskey "e">
-<!ENTITY viewPageSourceCmd.label "āĻĒ⧃āĻˇā§āĻ āĻžāϰ āϏ⧋āĻ°ā§āϏ āĻĒā§āϰāĻĻāĻ°ā§āĻļāύ (V)">
-<!ENTITY viewPageSourceCmd.accesskey "V">
-<!ENTITY viewFrameSourceCmd.label "āĻĢā§āϰ⧇āĻŽā§‡āϰ āϏ⧋āĻ°ā§āϏ āĻĒā§āϰāĻĻāĻ°ā§āĻļāύ (V)">
+<!ENTITY viewPageSourceCmd.label      "āĻĒ⧃āĻˇā§āĻ āĻžāϰ āϏ⧋āĻ°ā§āϏ āĻĒā§āϰāĻĻāĻ°ā§āĻļāύ (V)">
+<!ENTITY viewPageSourceCmd.accesskey  "V">
+<!ENTITY viewFrameSourceCmd.label     "āĻĢā§āϰ⧇āĻŽā§‡āϰ āϏ⧋āĻ°ā§āϏ āĻĒā§āϰāĻĻāĻ°ā§āĻļāύ (V)">
 <!ENTITY viewFrameSourceCmd.accesskey "V">
-<!ENTITY viewPageInfoCmd.label "āĻĒ⧃āĻˇā§āĻ āĻž āϏāĻ‚āĻ•ā§āϰāĻžāĻ¨ā§āϤ āϤāĻĨā§āϝ (I)">
-<!ENTITY viewPageInfoCmd.accesskey "I">
-<!ENTITY viewFrameInfoCmd.label "āĻĢā§āϰ⧇āĻŽ āϏāĻ‚āĻ•ā§āϰāĻžāĻ¨ā§āϤ āϤāĻĨā§āϝ (I)">
-<!ENTITY viewFrameInfoCmd.accesskey "I">
-<!ENTITY reloadImageCmd.label "āĻ›āĻŦāĻŋ āφāĻŦāĻžāϰ āϞ⧋āĻĄ āĻ•āϰāĻž āĻšāĻŦ⧇ (R)">
-<!ENTITY reloadImageCmd.accesskey "R">
-<!ENTITY viewImageCmd.label "āĻ›āĻŦāĻŋ āĻĒā§āϰāĻĻāĻ°ā§āĻļāύ (I)">
-<!ENTITY viewImageCmd.accesskey "I">
-<!ENTITY viewImageInfoCmd.label "āĻ›āĻŦāĻŋāϰ āϤāĻĨā§āϝ āĻĒā§āϰāĻĻāĻ°ā§āĻļāύ (f)">
-<!ENTITY viewImageInfoCmd.accesskey "f">
-<!ENTITY viewVideoCmd.label "āĻ­āĻŋāĻĄāĻŋāĻ“ āĻĒā§āϰāĻĻāĻ°ā§āĻļāύ (i)">
-<!ENTITY viewVideoCmd.accesskey "i">
-<!ENTITY viewBGImageCmd.label "āĻĒāϟāĻ­ā§‚āĻŽāĻŋāϰ āĻ›āĻŦāĻŋ āĻĒā§āϰāĻĻāĻ°ā§āĻļāύ (w)">
-<!ENTITY viewBGImageCmd.accesskey "w">
-<!ENTITY setDesktopBackgroundCmd.label "āĻĄā§‡āĻ¸ā§āĻ•āϟāĻĒ⧇āϰ āĻĒāϟāĻ­ā§‚āĻŽāĻŋ āĻšāĻŋāϏ⧇āĻŦ⧇ āύāĻŋāĻ°ā§āϧāĻžāϰāĻŖâ€Ļ (S)">
-<!ENTITY setDesktopBackgroundCmd.accesskey "S">
-<!ENTITY bookmarkPageCmd2.label "āĻāχ āĻĒ⧃āĻˇā§āĻ āĻž āĻŦ⧁āĻ•āĻŽāĻžāĻ°ā§āĻ• āĻ•āϰāĻž āĻšāĻŦ⧇ (m)">
-<!ENTITY bookmarkPageCmd2.accesskey "m">
-<!ENTITY bookmarkThisLinkCmd.label "āĻāχ āϞāĻŋāĻ‚āĻ• āĻŦ⧁āĻ•āĻŽāĻžāĻ°ā§āĻ• āĻ•āϰāĻž āĻšāĻŦ⧇ (L)">
-<!ENTITY bookmarkThisLinkCmd.accesskey "L">
-<!ENTITY bookmarkThisFrameCmd.label "āĻāχ āĻĢā§āϰ⧇āĻŽ āĻŦ⧁āĻ•āĻŽāĻžāĻ°ā§āĻ• āĻ•āϰāĻž āĻšāĻŦ⧇ (m)">
-<!ENTITY bookmarkThisFrameCmd.accesskey "m">
-<!ENTITY sendPageCmd.label "āϞāĻŋāĻ‚āĻ• āĻĒā§āϰ⧇āϰāĻŖâ€Ļ (e)">
-<!ENTITY sendPageCmd.accesskey "e">
-<!ENTITY savePageCmd.label "āĻĒ⧃āĻˇā§āĻ āĻž āύāϤ⧁āύāĻ­āĻžāĻŦ⧇ āϏāĻ‚āϰāĻ•ā§āώāĻŖâ€Ļ (A)">
-<!ENTITY savePageCmd.accesskey "A">
+<!ENTITY viewPageInfoCmd.label        "āĻĒ⧃āĻˇā§āĻ āĻž āϏāĻ‚āĻ•ā§āϰāĻžāĻ¨ā§āϤ āϤāĻĨā§āϝ (I)">
+<!ENTITY viewPageInfoCmd.accesskey    "I">
+<!ENTITY viewFrameInfoCmd.label       "āĻĢā§āϰ⧇āĻŽ āϏāĻ‚āĻ•ā§āϰāĻžāĻ¨ā§āϤ āϤāĻĨā§āϝ (I)">
+<!ENTITY viewFrameInfoCmd.accesskey   "I">
+<!ENTITY reloadImageCmd.label         "āĻ›āĻŦāĻŋ āφāĻŦāĻžāϰ āϞ⧋āĻĄ āĻ•āϰāĻž āĻšāĻŦ⧇ (R)">
+<!ENTITY reloadImageCmd.accesskey     "R">
+<!ENTITY viewImageCmd.label           "āĻ›āĻŦāĻŋ āĻĒā§āϰāĻĻāĻ°ā§āĻļāύ (I)">
+<!ENTITY viewImageCmd.accesskey       "I">
+<!ENTITY viewImageInfoCmd.label       "āĻ›āĻŦāĻŋāϰ āϤāĻĨā§āϝ āĻĒā§āϰāĻĻāĻ°ā§āĻļāύ (f)">
+<!ENTITY viewImageInfoCmd.accesskey   "f">
+<!ENTITY viewVideoCmd.label           "āĻ­āĻŋāĻĄāĻŋāĻ“ āĻĒā§āϰāĻĻāĻ°ā§āĻļāύ (i)">
+<!ENTITY viewVideoCmd.accesskey       "i">
+<!ENTITY viewBGImageCmd.label         "āĻĒāϟāĻ­ā§‚āĻŽāĻŋāϰ āĻ›āĻŦāĻŋ āĻĒā§āϰāĻĻāĻ°ā§āĻļāύ (w)">
+<!ENTITY viewBGImageCmd.accesskey     "w">
+<!ENTITY setDesktopBackgroundCmd.label      "āĻĄā§‡āĻ¸ā§āĻ•āϟāĻĒ⧇āϰ āĻĒāϟāĻ­ā§‚āĻŽāĻŋ āĻšāĻŋāϏ⧇āĻŦ⧇ āύāĻŋāĻ°ā§āϧāĻžāϰāĻŖâ€Ļ (S)">
+<!ENTITY setDesktopBackgroundCmd.accesskey  "S">
+<!ENTITY bookmarkPageCmd2.label       "āĻāχ āĻĒ⧃āĻˇā§āĻ āĻž āĻŦ⧁āĻ•āĻŽāĻžāĻ°ā§āĻ• āĻ•āϰāĻž āĻšāĻŦ⧇ (m)">
+<!ENTITY bookmarkPageCmd2.accesskey   "m">
+<!ENTITY bookmarkThisLinkCmd.label      "āĻāχ āϞāĻŋāĻ‚āĻ• āĻŦ⧁āĻ•āĻŽāĻžāĻ°ā§āĻ• āĻ•āϰāĻž āĻšāĻŦ⧇ (L)">
+<!ENTITY bookmarkThisLinkCmd.accesskey  "L">
+<!ENTITY bookmarkThisFrameCmd.label      "āĻāχ āĻĢā§āϰ⧇āĻŽ āĻŦ⧁āĻ•āĻŽāĻžāĻ°ā§āĻ• āĻ•āϰāĻž āĻšāĻŦ⧇ (m)">
+<!ENTITY bookmarkThisFrameCmd.accesskey  "m">
+<!ENTITY sendPageCmd.label            "āϞāĻŋāĻ‚āĻ• āĻĒā§āϰ⧇āϰāĻŖâ€Ļ (e)">
+<!ENTITY sendPageCmd.accesskey        "e">
+<!ENTITY savePageCmd.label            "āĻĒ⧃āĻˇā§āĻ āĻž āύāϤ⧁āύāĻ­āĻžāĻŦ⧇ āϏāĻ‚āϰāĻ•ā§āώāĻŖâ€Ļ (A)">
+<!ENTITY savePageCmd.accesskey        "A">
 <!-- alternate for content area context menu -->
-<!ENTITY savePageCmd.accesskey2 "P">
-<!ENTITY savePageCmd.commandkey "s">
-<!ENTITY saveFrameCmd.label "āĻĢā§āϰ⧇āĻŽ āύāϤ⧁āύāĻ­āĻžāĻŦ⧇ āϏāĻ‚āϰāĻ•ā§āώāĻŖâ€Ļ (F)">
-<!ENTITY saveFrameCmd.accesskey "F">
-<!ENTITY printFrameCmd.label "āĻĢā§āϰ⧇āĻŽ āĻŽā§āĻĻā§āϰāĻŖâ€Ļ (P)">
-<!ENTITY printFrameCmd.accesskey "P">
-<!ENTITY saveLinkCmd.label "āϞāĻŋāĻ‚āĻ• āύāϤ⧁āύāĻ­āĻžāĻŦ⧇ āϏāĻ‚āϰāĻ•ā§āώāĻŖâ€Ļ (k)">
-<!ENTITY saveLinkCmd.accesskey "k">
-<!ENTITY sendLinkCmd.label "āϞāĻŋāĻ‚āĻ• āĻĒā§āϰ⧇āϰāĻŖâ€Ļ (d)">
-<!ENTITY sendLinkCmd.accesskey "d">
-<!ENTITY saveImageCmd.label "āĻ›āĻŦāĻŋ āύāϤ⧁āύāĻ­āĻžāĻŦ⧇ āϏāĻ‚āϰāĻ•ā§āώāĻŖâ€Ļ (v)">
-<!ENTITY saveImageCmd.accesskey "v">
-<!ENTITY saveVideoCmd.label "āĻ­āĻŋāĻĄāĻŋāĻ“ āύāϤ⧁āύāĻ­āĻžāĻŦ⧇ āϏāĻ‚āϰāĻ•ā§āώāĻŖâ€Ļ (V)">
-<!ENTITY saveVideoCmd.accesskey "V">
-<!ENTITY saveAudioCmd.label "āĻ…āĻĄāĻŋāĻ“ āύāϤ⧁āύāĻ­āĻžāĻŦ⧇ āϏāĻ‚āϰāĻ•ā§āώāĻŖâ€Ļ (v)">
-<!ENTITY saveAudioCmd.accesskey "v">
-<!ENTITY sendImageCmd.label "āĻ›āĻŦāĻŋ āĻĒā§āϰ⧇āϰāĻŖâ€Ļ (n)">
-<!ENTITY sendImageCmd.accesskey "n">
-<!ENTITY sendVideoCmd.label "āĻ­āĻŋāĻĄāĻŋāĻ“ āĻĒā§āϰ⧇āϰāĻŖâ€Ļ (n)">
-<!ENTITY sendVideoCmd.accesskey "n">
-<!ENTITY sendAudioCmd.label "āĻ…āĻĄāĻŋāĻ“ āĻĒā§āϰ⧇āϰāĻŖâ€Ļ (n)">
-<!ENTITY sendAudioCmd.accesskey "n">
-<!ENTITY copyLinkCmd.label "āϞāĻŋāĻ‚āϕ⧇āϰ āĻ āĻŋāĻ•āĻžāύāĻž āĻ…āύ⧁āϞāĻŋāĻĒāĻŋ (a)">
-<!ENTITY copyLinkCmd.accesskey "a">
-<!ENTITY copyImageCmd.label "āĻ›āĻŦāĻŋāϰ āĻ āĻŋāĻ•āĻžāύāĻž āĻ…āύ⧁āϞāĻŋāĻĒāĻŋ (o)">
-<!ENTITY copyImageCmd.accesskey "o">
-<!ENTITY copyImageContentsCmd.label "āĻ›āĻŦāĻŋ āĻ…āύ⧁āϞāĻŋāĻĒāĻŋ (y)">
-<!ENTITY copyImageContentsCmd.accesskey "y">
-<!ENTITY copyVideoURLCmd.label "āĻ­āĻŋāĻĄāĻŋāĻ“āϰ āĻ āĻŋāĻ•āĻžāύāĻž āĻ…āύ⧁āϞāĻŋāĻĒāĻŋ (o)">
-<!ENTITY copyVideoURLCmd.accesskey "o">
-<!ENTITY copyAudioURLCmd.label "āĻ…āĻĄāĻŋāĻ“āϰ āĻ āĻŋāĻ•āĻžāύāĻž āĻ…āύ⧁āϞāĻŋāĻĒāĻŋ (o)">
-<!ENTITY copyAudioURLCmd.accesskey "o">
-<!ENTITY copyEmailCmd.label "āχāĻŽā§‡āχāϞ āĻ āĻŋāĻ•āĻžāύāĻž āĻ…āύ⧁āϞāĻŋāĻĒāĻŋ (E)">
-<!ENTITY copyEmailCmd.accesskey "E">
-<!ENTITY thisFrameMenu.label "āĻāχ āĻĢā§āϰ⧇āĻŽ (h)">
-<!ENTITY thisFrameMenu.accesskey "h">
+<!ENTITY savePageCmd.accesskey2       "P">
+<!ENTITY savePageCmd.commandkey       "s">
+<!ENTITY saveFrameCmd.label           "āĻĢā§āϰ⧇āĻŽ āύāϤ⧁āύāĻ­āĻžāĻŦ⧇ āϏāĻ‚āϰāĻ•ā§āώāĻŖâ€Ļ (F)">
+<!ENTITY saveFrameCmd.accesskey       "F">
+<!ENTITY printFrameCmd.label          "āĻĢā§āϰ⧇āĻŽ āĻŽā§āĻĻā§āϰāĻŖâ€Ļ (P)">
+<!ENTITY printFrameCmd.accesskey      "P">
+<!ENTITY saveLinkCmd.label            "āϞāĻŋāĻ‚āĻ• āύāϤ⧁āύāĻ­āĻžāĻŦ⧇ āϏāĻ‚āϰāĻ•ā§āώāĻŖâ€Ļ (k)">
+<!ENTITY saveLinkCmd.accesskey        "k">
+<!ENTITY sendLinkCmd.label            "āϞāĻŋāĻ‚āĻ• āĻĒā§āϰ⧇āϰāĻŖâ€Ļ (d)">
+<!ENTITY sendLinkCmd.accesskey        "d">
+<!ENTITY saveImageCmd.label           "āĻ›āĻŦāĻŋ āύāϤ⧁āύāĻ­āĻžāĻŦ⧇ āϏāĻ‚āϰāĻ•ā§āώāĻŖâ€Ļ (v)">
+<!ENTITY saveImageCmd.accesskey       "v">
+<!ENTITY saveVideoCmd.label           "āĻ­āĻŋāĻĄāĻŋāĻ“ āύāϤ⧁āύāĻ­āĻžāĻŦ⧇ āϏāĻ‚āϰāĻ•ā§āώāĻŖâ€Ļ (V)">
+<!ENTITY saveVideoCmd.accesskey       "V">
+<!ENTITY saveAudioCmd.label           "āĻ…āĻĄāĻŋāĻ“ āύāϤ⧁āύāĻ­āĻžāĻŦ⧇ āϏāĻ‚āϰāĻ•ā§āώāĻŖâ€Ļ (v)">
+<!ENTITY saveAudioCmd.accesskey       "v">
+<!ENTITY sendImageCmd.label           "āĻ›āĻŦāĻŋ āĻĒā§āϰ⧇āϰāĻŖâ€Ļ (n)">
+<!ENTITY sendImageCmd.accesskey       "n">
+<!ENTITY sendVideoCmd.label           "āĻ­āĻŋāĻĄāĻŋāĻ“ āĻĒā§āϰ⧇āϰāĻŖâ€Ļ (n)">
+<!ENTITY sendVideoCmd.accesskey       "n">
+<!ENTITY sendAudioCmd.label           "āĻ…āĻĄāĻŋāĻ“ āĻĒā§āϰ⧇āϰāĻŖâ€Ļ (n)">
+<!ENTITY sendAudioCmd.accesskey       "n">
+<!ENTITY copyLinkCmd.label            "āϞāĻŋāĻ‚āϕ⧇āϰ āĻ āĻŋāĻ•āĻžāύāĻž āĻ…āύ⧁āϞāĻŋāĻĒāĻŋ (a)">
+<!ENTITY copyLinkCmd.accesskey        "a">
+<!ENTITY copyImageCmd.label           "āĻ›āĻŦāĻŋāϰ āĻ āĻŋāĻ•āĻžāύāĻž āĻ…āύ⧁āϞāĻŋāĻĒāĻŋ (o)">
+<!ENTITY copyImageCmd.accesskey       "o">
+<!ENTITY copyImageContentsCmd.label   "āĻ›āĻŦāĻŋ āĻ…āύ⧁āϞāĻŋāĻĒāĻŋ (y)">
+<!ENTITY copyImageContentsCmd.accesskey  "y">
+<!ENTITY copyVideoURLCmd.label        "āĻ­āĻŋāĻĄāĻŋāĻ“āϰ āĻ āĻŋāĻ•āĻžāύāĻž āĻ…āύ⧁āϞāĻŋāĻĒāĻŋ (o)">
+<!ENTITY copyVideoURLCmd.accesskey    "o">
+<!ENTITY copyAudioURLCmd.label        "āĻ…āĻĄāĻŋāĻ“āϰ āĻ āĻŋāĻ•āĻžāύāĻž āĻ…āύ⧁āϞāĻŋāĻĒāĻŋ (o)">
+<!ENTITY copyAudioURLCmd.accesskey    "o">
+<!ENTITY copyEmailCmd.label           "āχāĻŽā§‡āχāϞ āĻ āĻŋāĻ•āĻžāύāĻž āĻ…āύ⧁āϞāĻŋāĻĒāĻŋ (E)">
+<!ENTITY copyEmailCmd.accesskey       "E">
+<!ENTITY thisFrameMenu.label              "āĻāχ āĻĢā§āϰ⧇āĻŽ (h)">
+<!ENTITY thisFrameMenu.accesskey          "h">
 <!-- Media (video/audio) controls -->
 
-<!ENTITY mediaPlay.label "āϚāĻžāϞāĻžāύ (P)">
-<!ENTITY mediaPlay.accesskey "P">
-<!ENTITY mediaPause.label "āĻŦāĻŋāϰāϤāĻŋ (P)">
-<!ENTITY mediaPause.accesskey "P">
-<!ENTITY mediaMute.label "āĻļāĻŦā§āĻĻ āĻŦāĻ¨ā§āϧ (M)">
-<!ENTITY mediaMute.accesskey "M">
-<!ENTITY mediaUnmute.label "āĻļāĻŦā§āĻĻ āϚāĻžāϞ⧁ (m)">
-<!ENTITY mediaUnmute.accesskey "m">
-<!ENTITY mediaShowControls.label "āĻ•āĻ¨ā§āĻŸā§āϰ⧋āϞāϏāĻŽā§‚āĻš āĻĒā§āϰāĻĻāĻ°ā§āĻļāύ (C)">
+<!ENTITY mediaPlay.label             "āϚāĻžāϞāĻžāύ (P)">
+<!ENTITY mediaPlay.accesskey         "P">
+<!ENTITY mediaPause.label            "āĻŦāĻŋāϰāϤāĻŋ (P)">
+<!ENTITY mediaPause.accesskey        "P">
+<!ENTITY mediaMute.label             "āĻļāĻŦā§āĻĻ āĻŦāĻ¨ā§āϧ (M)">
+<!ENTITY mediaMute.accesskey         "M">
+<!ENTITY mediaUnmute.label           "āĻļāĻŦā§āĻĻ āϚāĻžāϞ⧁ (m)">
+<!ENTITY mediaUnmute.accesskey       "m">
+<!ENTITY mediaShowControls.label     "āĻ•āĻ¨ā§āĻŸā§āϰ⧋āϞāϏāĻŽā§‚āĻš āĻĒā§āϰāĻĻāĻ°ā§āĻļāύ (C)">
 <!ENTITY mediaShowControls.accesskey "C">
-<!ENTITY mediaHideControls.label "āĻ•āĻ¨ā§āĻŸā§āϰ⧋āϞāϏāĻŽā§‚āĻš āĻ†ā§œāĻžāϞ (C)">
+<!ENTITY mediaHideControls.label     "āĻ•āĻ¨ā§āĻŸā§āϰ⧋āϞāϏāĻŽā§‚āĻš āĻ†ā§œāĻžāϞ (C)">
 <!ENTITY mediaHideControls.accesskey "C">
-<!ENTITY videoFullScreen.label "āĻĒā§‚āĻ°ā§āĻŖ āĻĒāĻ°ā§āĻĻāĻžāĻœā§ā§œā§‡ (F)">
-<!ENTITY videoFullScreen.accesskey "F">
+<!ENTITY videoFullScreen.label       "āĻĒā§‚āĻ°ā§āĻŖ āĻĒāĻ°ā§āĻĻāĻžāĻœā§ā§œā§‡ (F)">
+<!ENTITY videoFullScreen.accesskey   "F">
 <!-- 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 "āĻŦ⧜ āφāĻ•āĻžāϰ⧇ āĻĒā§āϰāĻĻāĻ°ā§āĻļāύ (I)">
-<!ENTITY fullZoomEnlargeCmd.accesskey "I">
-<!ENTITY fullZoomEnlargeCmd.commandkey "+">
+<!ENTITY fullZoomEnlargeCmd.label       "āĻŦ⧜ āφāĻ•āĻžāϰ⧇ āĻĒā§āϰāĻĻāĻ°ā§āĻļāύ (I)">
+<!ENTITY fullZoomEnlargeCmd.accesskey   "I">
+<!ENTITY fullZoomEnlargeCmd.commandkey  "+">
 <!-- + is above this key on many keyboards -->
 <!ENTITY fullZoomEnlargeCmd.commandkey2 "=">
 <!ENTITY fullZoomEnlargeCmd.commandkey3 "">
 
-<!ENTITY fullZoomReduceCmd.label "āϛ⧋āϟ āφāĻ•āĻžāϰ⧇ āĻĒā§āϰāĻĻāĻ°ā§āĻļāύ (O)">
-<!ENTITY fullZoomReduceCmd.accesskey "O">
-<!ENTITY fullZoomReduceCmd.commandkey "-">
-<!ENTITY fullZoomReduceCmd.commandkey2 "">
+<!ENTITY fullZoomReduceCmd.label        "āϛ⧋āϟ āφāĻ•āĻžāϰ⧇ āĻĒā§āϰāĻĻāĻ°ā§āĻļāύ (O)">
+<!ENTITY fullZoomReduceCmd.accesskey    "O">
+<!ENTITY fullZoomReduceCmd.commandkey   "-">
+<!ENTITY fullZoomReduceCmd.commandkey2  "">
 
-<!ENTITY fullZoomResetCmd.label "āĻĒ⧁āύāσāύāĻŋāĻ°ā§āϧāĻžāϰāĻŖ (R)">
-<!ENTITY fullZoomResetCmd.accesskey "R">
-<!ENTITY fullZoomResetCmd.commandkey "0">
-<!ENTITY fullZoomResetCmd.commandkey2 "">
+<!ENTITY fullZoomResetCmd.label         "āĻĒ⧁āύāσāύāĻŋāĻ°ā§āϧāĻžāϰāĻŖ (R)">
+<!ENTITY fullZoomResetCmd.accesskey     "R">
+<!ENTITY fullZoomResetCmd.commandkey    "0">
+<!ENTITY fullZoomResetCmd.commandkey2   "">
 
-<!ENTITY fullZoomToggleCmd.label "āĻļ⧁āϧ⧁āĻŽāĻžāĻ¤ā§āϰ āϞ⧇āĻ–āĻž āĻŦ⧜ āφāĻ•āĻžāϰ⧇ āĻĒā§āϰāĻĻāĻ°ā§āĻļāĻŋāϤ āĻšāĻŦ⧇ (T)">
-<!ENTITY fullZoomToggleCmd.accesskey "T">
-<!ENTITY fullZoom.label "āĻŦ⧜ āφāĻ•āĻžāϰ⧇ āĻĒā§āϰāĻĻāĻ°ā§āĻļāύ (Z)">
-<!ENTITY fullZoom.accesskey "Z">
+<!ENTITY fullZoomToggleCmd.label        "āĻļ⧁āϧ⧁āĻŽāĻžāĻ¤ā§āϰ āϞ⧇āĻ–āĻž āĻŦ⧜ āφāĻ•āĻžāϰ⧇ āĻĒā§āϰāĻĻāĻ°ā§āĻļāĻŋāϤ āĻšāĻŦ⧇ (T)">
+<!ENTITY fullZoomToggleCmd.accesskey    "T">
+<!ENTITY fullZoom.label                 "āĻŦ⧜ āφāĻ•āĻžāϰ⧇ āĻĒā§āϰāĻĻāĻ°ā§āĻļāύ (Z)">
+<!ENTITY fullZoom.accesskey             "Z">
 
-<!ENTITY newTabButton.tooltip "āύāϤ⧁āύ āĻŸā§āϝāĻžāĻŦ āĻ–ā§‹āϞāĻž āĻšāĻŦ⧇">
-<!ENTITY newWindowButton.tooltip "āύāϤ⧁āύ āωāχāĻ¨ā§āĻĄā§‹ āĻ–ā§‹āϞāĻž āĻšāĻŦ⧇">
-<!ENTITY sidebarCloseButton.tooltip "āϏāĻžāχāĻĄāĻŦāĻžāϰ āĻŦāĻ¨ā§āϧ">
+<!ENTITY newTabButton.tooltip           "āύāϤ⧁āύ āĻŸā§āϝāĻžāĻŦ āĻ–ā§‹āϞāĻž āĻšāĻŦ⧇">
+<!ENTITY newWindowButton.tooltip        "āύāϤ⧁āύ āωāχāĻ¨ā§āĻĄā§‹ āĻ–ā§‹āϞāĻž āĻšāĻŦ⧇">
+<!ENTITY sidebarCloseButton.tooltip     "āϏāĻžāχāĻĄāĻŦāĻžāϰ āĻŦāĻ¨ā§āϧ">
 
-<!ENTITY cutButton.tooltip "āĻ•āĻžāϟāĻž">
-<!ENTITY copyButton.tooltip "āĻ…āύ⧁āϞāĻŋāĻĒāĻŋ">
-<!ENTITY pasteButton.tooltip "āĻĒā§āϰāϤāĻŋāϞ⧇āĻĒāύ">
+<!ENTITY cutButton.tooltip              "āĻ•āĻžāϟāĻž">
+<!ENTITY copyButton.tooltip             "āĻ…āύ⧁āϞāĻŋāĻĒāĻŋ">
+<!ENTITY pasteButton.tooltip            "āĻĒā§āϰāϤāĻŋāϞ⧇āĻĒāύ">
 
-<!ENTITY fullScreenButton.tooltip "āĻĒā§‚āĻ°ā§āĻŖ āĻĒāĻ°ā§āĻĻāĻžā§Ÿ āωāχāĻ¨ā§āĻĄā§‹ āĻĒā§āϰāĻĻāĻ°ā§āĻļāύ">
+<!ENTITY fullScreenButton.tooltip       "āĻĒā§‚āĻ°ā§āĻŖ āĻĒāĻ°ā§āĻĻāĻžā§Ÿ āωāχāĻ¨ā§āĻĄā§‹ āĻĒā§āϰāĻĻāĻ°ā§āĻļāύ">
 
-<!ENTITY zoomOutButton.tooltip "āϛ⧋āϟ āφāĻ•āĻžāϰ⧇ āĻĒā§āϰāĻĻāĻ°ā§āĻļāύ">
-<!ENTITY zoomInButton.tooltip "āĻŦ⧜ āφāĻ•āĻžāϰ⧇ āĻĒā§āϰāĻĻāĻ°ā§āĻļāύ">
-<!ENTITY zoomControls.label "āĻŦ⧜ āφāĻ•āĻžāϰ⧇ āĻĒā§āϰāĻĻāĻ°ā§āĻļāύ āĻ•āĻ¨ā§āĻŸā§āϰ⧋āϞ">
+<!ENTITY zoomOutButton.tooltip          "āϛ⧋āϟ āφāĻ•āĻžāϰ⧇ āĻĒā§āϰāĻĻāĻ°ā§āĻļāύ">
+<!ENTITY zoomInButton.tooltip           "āĻŦ⧜ āφāĻ•āĻžāϰ⧇ āĻĒā§āϰāĻĻāĻ°ā§āĻļāύ">
+<!ENTITY zoomControls.label             "āĻŦ⧜ āφāĻ•āĻžāϰ⧇ āĻĒā§āϰāĻĻāĻ°ā§āĻļāύ āĻ•āĻ¨ā§āĻŸā§āϰ⧋āϞ">
 
-<!ENTITY quitApplicationCmdWin.label "āĻĒā§āϰāĻ¸ā§āĻĨāĻžāύ (x)">
-<!ENTITY quitApplicationCmdWin.accesskey "x">
+<!ENTITY quitApplicationCmdWin.label       "āĻĒā§āϰāĻ¸ā§āĻĨāĻžāύ (x)">
+<!ENTITY quitApplicationCmdWin.accesskey   "x">
 <!ENTITY goBackCmd.commandKey "[">
 <!ENTITY goForwardCmd.commandKey "]">
-<!ENTITY quitApplicationCmd.label "āĻĒā§āϰāĻ¸ā§āĻĨāĻžāύ (Q)">
-<!ENTITY quitApplicationCmd.accesskey "Q">
-<!ENTITY quitApplicationCmdMac.label "&brandShortName; āĻĨ⧇āϕ⧇ āĻĒā§āϰāĻ¸ā§āĻĨāĻžāύ">
-<!ENTITY quitApplicationCmdMac.key "Q">
+<!ENTITY quitApplicationCmd.label       "āĻĒā§āϰāĻ¸ā§āĻĨāĻžāύ (Q)">
+<!ENTITY quitApplicationCmd.accesskey   "Q">
+<!ENTITY quitApplicationCmdMac.label    "&brandShortName; āĻĨ⧇āϕ⧇ āĻĒā§āϰāĻ¸ā§āĻĨāĻžāύ">
+<!ENTITY quitApplicationCmdMac.key      "Q">
 
-<!ENTITY closeCmd.label "āĻŦāĻ¨ā§āϧ (C)">
-<!ENTITY closeCmd.key "W">
-<!ENTITY closeCmd.accesskey "C">
+<!ENTITY closeCmd.label                 "āĻŦāĻ¨ā§āϧ (C)">
+<!ENTITY closeCmd.key                   "W">
+<!ENTITY closeCmd.accesskey             "C">
 
 <!ENTITY pageStyleMenu.label "āĻĒ⧃āĻˇā§āĻ āĻž āĻļ⧈āϞ⧀ (y)">
 <!ENTITY pageStyleMenu.accesskey "y">
 <!ENTITY pageStyleNoStyle.label "āĻļ⧈āϞ⧀āĻŦāĻŋāĻšā§€āύ (N)">
 <!ENTITY pageStyleNoStyle.accesskey "N">
 <!ENTITY pageStylePersistentOnly.label "āĻŽā§ŒāϞāĻŋāĻ• āĻĒ⧃āĻˇā§āĻ āĻžāĻļ⧈āϞ⧀ (B)">
 <!ENTITY pageStylePersistentOnly.accesskey "B">
 
-<!ENTITY pageReportIcon.tooltip "āĻāχ āĻ“ā§Ÿā§‡āĻŦ āϏāĻžāχāĻŸā§‡āϰ āĻĒāĻĒ-āφāĻĒ āϰ⧋āϧ⧇āϰ āϏ⧇āϟāĻŋāĻ‚āϏāĻŽā§‚āĻš āĻĒāϰāĻŋāĻŦāĻ°ā§āϤāύ">
+<!ENTITY pageReportIcon.tooltip            "āĻāχ āĻ“ā§Ÿā§‡āĻŦ āϏāĻžāχāĻŸā§‡āϰ āĻĒāĻĒ-āφāĻĒ āϰ⧋āϧ⧇āϰ āϏ⧇āϟāĻŋāĻ‚āϏāĻŽā§‚āĻš āĻĒāϰāĻŋāĻŦāĻ°ā§āϤāύ">
 
 <!ENTITY allowPopups.accesskey "p">
 <!-- On Windows we use the term "Options" to describe settings, but
      on Linux and Mac OS X we use "Preferences" - carry that distinction
      over into this string, which is used in the "popup blocked" info bar . -->
 <!ENTITY editPopupSettingsUnix.label "āĻĒāĻĒ-āφāĻĒ āϰ⧋āϧ āϏāĻ‚āĻ•ā§āϰāĻžāĻ¨ā§āϤ āĻĒāĻ›āĻ¨ā§āĻĻāϏāĻŽā§‚āĻš āϏāĻŽā§āĻĒāĻžāĻĻāύāĻžâ€Ļ">
 <!ENTITY editPopupSettings.label "āĻĒāĻĒ-āφāĻĒ āϰ⧋āϧ āϏāĻ‚āĻ•ā§āϰāĻžāĻ¨ā§āϤ āĻ…āĻĒāĻļāύ āϏāĻŽā§āĻĒāĻžāĻĻāύāĻžâ€Ļ (E)">
 <!ENTITY editPopupSettings.accesskey "E">
 <!ENTITY dontShowMessage.accesskey "D">
 
-<!ENTITY bidiSwitchPageDirectionItem.label "āĻĒ⧃āĻˇā§āĻ āĻžāϰ āĻĻāĻŋāĻ•āĻŦāĻŋāĻ¨ā§āϝāĻžāϏ āĻĒāϰāĻŋāĻŦāĻ°ā§āϤāύ (g)">
-<!ENTITY bidiSwitchPageDirectionItem.accesskey "g">
-<!ENTITY bidiSwitchTextDirectionItem.label "āϞ⧇āĻ–āĻžāϰ āĻĻāĻŋāĻ•āĻŦāĻŋāĻ¨ā§āϝāĻžāϏ āĻĒāϰāĻŋāĻŦāĻ°ā§āϤāύ (w)">
-<!ENTITY bidiSwitchTextDirectionItem.accesskey "w">
-<!ENTITY bidiSwitchTextDirectionItem.commandkey "X">
+<!ENTITY bidiSwitchPageDirectionItem.label        "āĻĒ⧃āĻˇā§āĻ āĻžāϰ āĻĻāĻŋāĻ•āĻŦāĻŋāĻ¨ā§āϝāĻžāϏ āĻĒāϰāĻŋāĻŦāĻ°ā§āϤāύ (g)">
+<!ENTITY bidiSwitchPageDirectionItem.accesskey    "g">
+<!ENTITY bidiSwitchTextDirectionItem.label        "āϞ⧇āĻ–āĻžāϰ āĻĻāĻŋāĻ•āĻŦāĻŋāĻ¨ā§āϝāĻžāϏ āĻĒāϰāĻŋāĻŦāĻ°ā§āϤāύ (w)">
+<!ENTITY bidiSwitchTextDirectionItem.accesskey    "w">
+<!ENTITY bidiSwitchTextDirectionItem.commandkey   "X">
 
-<!ENTITY findOnCmd.label "āĻāχ āĻĒ⧃āĻˇā§āĻ āĻžā§Ÿ āϖ⧁āρāϜ⧁āύâ€Ļ (F)">
+<!ENTITY findOnCmd.label     "āĻāχ āĻĒ⧃āĻˇā§āĻ āĻžā§Ÿ āϖ⧁āρāϜ⧁āύâ€Ļ (F)">
 <!ENTITY findOnCmd.accesskey "F">
 <!ENTITY findOnCmd.commandkey "f">
-<!ENTITY findAgainCmd.label "āĻĒ⧁āύāϰāĻžā§Ÿ āϖ⧁āρāϜ⧁āύ (g)">
+<!ENTITY findAgainCmd.label  "āĻĒ⧁āύāϰāĻžā§Ÿ āϖ⧁āρāϜ⧁āύ (g)">
 <!ENTITY findAgainCmd.accesskey "g">
 <!ENTITY findAgainCmd.commandkey "g">
 <!ENTITY findAgainCmd.commandkey2 "VK_F3">
 
 <!ENTITY spellAddDictionaries.label "āĻ…āĻ­āĻŋāϧāĻžāύ āϝ⧋āĻ—â€Ļ (A)">
 <!ENTITY spellAddDictionaries.accesskey "A">
 
-<!ENTITY editBookmark.done.label "āϏāĻŽā§āĻĒāĻ¨ā§āύ">
-<!ENTITY editBookmark.cancel.label "āĻŦāĻžāϤāĻŋāϞ">
-<!ENTITY editBookmark.removeBookmark.accessKey "R">
+<!ENTITY editBookmark.done.label                     "āϏāĻŽā§āĻĒāĻ¨ā§āύ">
+<!ENTITY editBookmark.cancel.label                   "āĻŦāĻžāϤāĻŋāϞ">
+<!ENTITY editBookmark.removeBookmark.accessKey       "R">
 
 <!ENTITY identity.unverifiedsite2 "āĻāχ āĻ“ā§Ÿā§‡āĻŦāϏāĻžāχāϟāĻŋ āύāĻŋāĻœā§‡āϰ āĻĒāϰāĻŋāϚ⧟ āϏāĻ‚āĻ•ā§āϰāĻžāĻ¨ā§āϤ āϕ⧋āύ āϤāĻĨā§āϝ āĻĻā§‡ā§Ÿ āύāĻžāĨ¤">
 <!ENTITY identity.connectedTo "āφāĻĒāύāĻŋ āĻāχ āϏāĻžāχāĻŸā§‡āϰ āϏāĻžāĻĨ⧇ āϏāĻ‚āϝ⧁āĻ•ā§āϤ">
 <!-- Localization note (identity.runBy) : This string appears between a
 domain name (above) and an organization name (below). E.g.
 
 example.com
 which is run by
@@ -535,20 +556,20 @@ just addresses the organization to follo
 <!ENTITY downloadMonitor2.tooltip "āĻĄāĻžāωāύāϞ⧋āĻĄ āωāχāĻ¨ā§āĻĄā§‹ āϖ⧁āϞāϤ⧇ āĻ•ā§āϞāĻŋāĻ• āĻ•āϰ⧁āύ">
 
 <!ENTITY allTabs.filter.emptyText "āĻŸā§āϝāĻžāĻŦ āĻ…āύ⧁āϏāĻ¨ā§āϧāĻžāύ">
 <!-- Name for the tabs toolbar as spoken by screen readers.
      The word "toolbar" is appended automatically and should not be contained below! -->
 <!ENTITY tabsToolbar.label "āĻŦā§āϰāĻžāωāϜāĻžāϰ āĻŸā§āϝāĻžāĻŦ">
 <!-- LOCALIZATION NOTE (syncTabsMenu.label): This appears in the history menu -->
 
-<!ENTITY syncTabsMenu.label "āĻ…āĻ¨ā§āϝāĻžāĻ¨ā§āϝ āĻ•āĻŽā§āĻĒāĻŋāωāϟāĻžāϰ āĻĨ⧇āϕ⧇ āĻŸā§āϝāĻžāĻŦ">
+<!ENTITY syncTabsMenu.label     "āĻ…āĻ¨ā§āϝāĻžāĻ¨ā§āϝ āĻ•āĻŽā§āĻĒāĻŋāωāϟāĻžāϰ āĻĨ⧇āϕ⧇ āĻŸā§āϝāĻžāĻŦ">
 
-<!ENTITY syncBrand.shortName.label "āϏāĻŋāĻ™ā§āĻ•">
+<!ENTITY syncBrand.shortName.label    "āϏāĻŋāĻ™ā§āĻ•">
 
-<!ENTITY syncSetup.label "syncBrand.shortName.label;āύāĻŋāĻ°ā§āϧāĻžāϰāύâ€Ļ (s)">
-<!ENTITY syncSetup.accesskey "Y">
-<!ENTITY syncSyncNowItem.label "āĻāĻ–āύ āϏāĻŋāĻ™ā§āĻ• (S)">
-<!ENTITY syncSyncNowItem.accesskey "S">
-<!ENTITY syncToolbarButton.label "āϏāĻŋāĻ™ā§āĻ•">
+<!ENTITY syncSetup.label              "syncBrand.shortName.label;āύāĻŋāĻ°ā§āϧāĻžāϰāύâ€Ļ (s)">
+<!ENTITY syncSetup.accesskey          "Y">
+<!ENTITY syncSyncNowItem.label        "āĻāĻ–āύ āϏāĻŋāĻ™ā§āĻ• (S)">
+<!ENTITY syncSyncNowItem.accesskey    "S">
+<!ENTITY syncToolbarButton.label      "āϏāĻŋāĻ™ā§āĻ•">
 
-<!ENTITY addonBarCloseButton.tooltip "āĻ…ā§āϝāĻžāĻĄ-āĻ…āύ āĻŦāĻžāϰ āĻŦāĻ¨ā§āϧ">
-<!ENTITY toggleAddonBarCmd.key "/">
+<!ENTITY addonBarCloseButton.tooltip  "āĻ…ā§āϝāĻžāĻĄ-āĻ…āύ āĻŦāĻžāϰ āĻŦāĻ¨ā§āϧ">
+<!ENTITY toggleAddonBarCmd.key        "/">
--- a/browser/chrome/browser/browser.properties
+++ b/browser/chrome/browser/browser.properties
@@ -107,17 +107,17 @@ blockedpluginsMessage.infoButton.accessk
 blockedpluginsMessage.searchButton.label=āĻĒā§āϞāĻžāĻ—-āχāύ āĻšāĻžāϞāύāĻžāĻ—āĻžāĻĻâ€Ļ (U)
 blockedpluginsMessage.searchButton.accesskey=U
 crashedpluginsMessage.title=%S āĻĒā§āϞāĻžāĻ—āχāύ āĻ•ā§āĻ°ā§āϝāĻžāĻļ āĻ•āϰ⧇āϛ⧇āĨ¤
 crashedpluginsMessage.reloadButton.label=āĻĒ⧃āĻˇā§āĻ āĻž āϰāĻŋāϞ⧋āĻĄ
 crashedpluginsMessage.reloadButton.accesskey=R
 crashedpluginsMessage.submitButton.label=āĻ•ā§āĻ°ā§āϝāĻžāĻļ āĻĒā§āϰāϤāĻŋāĻŦ⧇āĻĻāύ āϜāĻŽāĻž
 crashedpluginsMessage.submitButton.accesskey=S
 crashedpluginsMessage.learnMore=āφāϰāĻ“ āϜāĻžāύ⧁āύâ€Ļ
-carbonFailurePluginsMessage.title=āĻāχ āĻĒ⧃āĻˇā§āĻ āĻžāϰ āϜāĻ¨ā§āϝ āĻĒā§āϞāĻžāĻ—-āχāύ āĻĒā§āĻ°ā§Ÿā§‹āϜāύ, āϝāĻž āϕ⧇āĻŦāϞ ā§Šā§¨ āĻŦāĻŋāϟ āĻŽā§‹āĻĄā§‡ āϚāϞ⧇
+carbonFailurePluginsMessage.message=This page asks to use a plugin that can only run in 32-bit mode
 carbonFailurePluginsMessage.restartButton.label=ā§Šā§¨ āĻŦāĻŋāϟ āĻ āĻĒ⧁āϰāύāĻžā§Ÿ āϚāĻžāϞ⧁ (R)
 carbonFailurePluginsMessage.restartButton.accesskey=R
 
 # Sanitize
 # LOCALIZATION NOTE (sanitizeDialog2.everything.title): When "Time range to
 # clear" is set to "Everything", the Clear Recent History dialog's title is
 # changed to this.  See UI mockup and comment 11 at bug 480169 -->
 sanitizeDialog2.everything.title=āϏāĻŦ āχāϤāĻŋāĻšāĻžāϏ āĻ…āĻĒāϏāĻžāϰāĻŖ
@@ -311,8 +311,15 @@ safeModeRestartButton=āĻĒ⧁āύāϰāĻžā§Ÿ āĻļ⧁āϰ⧁ āĻ•āϰ⧁āύ
 # Encoding" menu in the main Firefox button on Windows. Any other value will
 # hide it. Regardless of the value of this setting, the "Character Encoding"
 # menu will always be accessible via the "Web Developer" menu.
 # This is not a string to translate; it just controls whether the menu shows
 # up in the Firefox button. If users frequently use the "Character Encoding"
 # menu, set this to "true". Otherwise, you can leave it as "false".
 browser.menu.showCharacterEncoding=false
 
+# LOCALIZATION NOTE (syncPromoNotification.bookmarks.label): This appears in
+# the add bookmark star panel.  %S will be replaced by syncBrandShortName.
+syncPromoNotification.bookmarks.label=You can access your bookmarks on all your devices with %S.
+# LOCALIZATION NOTE (syncPromoNotification.passwords.label): This appears in
+# the remember password panel.  %S will be replaced by syncBrandShortName.
+syncPromoNotification.passwords.label=You can access your passwords on all your devices with %S.
+syncPromoNotification.learnMoreLinkText=Learn More
--- a/browser/chrome/browser/engineManager.dtd
+++ b/browser/chrome/browser/engineManager.dtd
@@ -1,25 +1,25 @@
-<!ENTITY engineManager.title "āĻ…āύ⧁āϏāĻ¨ā§āϧāĻžāύ āχāύāϜāĻŋāύ⧇āϰ āϤāĻžāϞāĻŋāĻ•āĻž āĻŦā§āϝāĻŦāĻ¸ā§āĻĨāĻžāĻĒāύāĻž">
-<!ENTITY engineManager.style "min-width: 35em;">
-<!ENTITY engineManager.intro "āύāĻŋāĻŽā§āύāϞāĻŋāĻ–āĻŋāϤ āĻ…āύ⧁āϏāĻ¨ā§āϧāĻžāύ āχāύāϜāĻŋāύāϗ⧁āϞ⧋ āχāύāĻ¸ā§āϟāϞ āĻ•āϰāĻž āφāϛ⧇:">
+<!ENTITY  engineManager.title       "āĻ…āύ⧁āϏāĻ¨ā§āϧāĻžāύ āχāύāϜāĻŋāύ⧇āϰ āϤāĻžāϞāĻŋāĻ•āĻž āĻŦā§āϝāĻŦāĻ¸ā§āĻĨāĻžāĻĒāύāĻž">
+<!ENTITY  engineManager.style       "min-width: 35em;">
+<!ENTITY  engineManager.intro       "āύāĻŋāĻŽā§āύāϞāĻŋāĻ–āĻŋāϤ āĻ…āύ⧁āϏāĻ¨ā§āϧāĻžāύ āχāύāϜāĻŋāύāϗ⧁āϞ⧋ āχāύāĻ¸ā§āϟāϞ āĻ•āϰāĻž āφāϛ⧇:">
 
-<!ENTITY columnLabel.name "āύāĻžāĻŽ">
-<!ENTITY columnLabel.keyword "āϕ⧀āĻ“ā§ŸāĻžāĻ°ā§āĻĄ">
+<!ENTITY  columnLabel.name          "āύāĻžāĻŽ">
+<!ENTITY  columnLabel.keyword       "āϕ⧀āĻ“ā§ŸāĻžāĻ°ā§āĻĄ">
 <!-- Buttons -->
 
-<!ENTITY up.label "āωāĻĒāϰ⧇ āĻ¸ā§āĻĨāĻžāύāĻžāĻ¨ā§āϤāϰ (U)">
-<!ENTITY up.accesskey "U">
-<!ENTITY dn.label "āύ⧀āĻšā§‡ āĻ¸ā§āĻĨāĻžāύāĻžāĻ¨ā§āϤāϰ (D)">
-<!ENTITY dn.accesskey "D">
-<!ENTITY remove.label "āϏāϰāĻŋā§Ÿā§‡ āĻĢ⧇āϞ⧁āύ (R)">
-<!ENTITY remove.accesskey "R">
-<!ENTITY edit.label "āϕ⧀āĻ“ā§ŸāĻžāĻ°ā§āĻĄ āϏāĻŽā§āĻĒāĻžāĻĻāύāĻžâ€Ļ (t)">
-<!ENTITY edit.accesskey "t">
+<!ENTITY  up.label                  "āωāĻĒāϰ⧇ āĻ¸ā§āĻĨāĻžāύāĻžāĻ¨ā§āϤāϰ (U)">
+<!ENTITY  up.accesskey              "U">
+<!ENTITY  dn.label                  "āύ⧀āĻšā§‡ āĻ¸ā§āĻĨāĻžāύāĻžāĻ¨ā§āϤāϰ (D)">
+<!ENTITY  dn.accesskey              "D">
+<!ENTITY  remove.label              "āϏāϰāĻŋā§Ÿā§‡ āĻĢ⧇āϞ⧁āύ (R)">
+<!ENTITY  remove.accesskey          "R">
+<!ENTITY  edit.label                "āϕ⧀āĻ“ā§ŸāĻžāĻ°ā§āĻĄ āϏāĻŽā§āĻĒāĻžāĻĻāύāĻžâ€Ļ (t)">
+<!ENTITY  edit.accesskey            "t">
 
-<!ENTITY addEngine.label "āφāϰāĻ“ āχāύāϜāĻŋāύ āĻ…āύ⧁āϏāĻ¨ā§āϧāĻžāύ... (a)">
-<!ENTITY addEngine.accesskey "a">
+<!ENTITY  addEngine.label           "āφāϰāĻ“ āχāύāϜāĻŋāύ āĻ…āύ⧁āϏāĻ¨ā§āϧāĻžāύ... (a)">
+<!ENTITY  addEngine.accesskey       "a">
 
-<!ENTITY enableSuggest.label "āĻ…āύ⧁āϏāĻ¨ā§āϧāĻžāύ⧇ āĻĒāϰāĻžāĻŽāĻ°ā§āĻļ āĻĻā§‡ā§ŸāĻž āĻšāĻŦ⧇ (S)">
-<!ENTITY enableSuggest.accesskey "S">
+<!ENTITY  enableSuggest.label       "āĻ…āύ⧁āϏāĻ¨ā§āϧāĻžāύ⧇ āĻĒāϰāĻžāĻŽāĻ°ā§āĻļ āĻĻā§‡ā§ŸāĻž āĻšāĻŦ⧇ (S)">
+<!ENTITY  enableSuggest.accesskey   "S">
 
-<!ENTITY restoreDefaults.label "āĻĄāĻŋāĻĢāĻ˛ā§āϟ āĻŽāĻžāύ āĻĒ⧁āύāϰāĻžā§Ÿ āĻ¸ā§āĻĨāĻžāĻĒāύ (e)">
-<!ENTITY restoreDefaults.accesskey "e">
+<!ENTITY  restoreDefaults.label     "āĻĄāĻŋāĻĢāĻ˛ā§āϟ āĻŽāĻžāύ āĻĒ⧁āύāϰāĻžā§Ÿ āĻ¸ā§āĻĨāĻžāĻĒāύ (e)">
+<!ENTITY  restoreDefaults.accesskey "e">
--- a/browser/chrome/browser/migration/migration.dtd
+++ b/browser/chrome/browser/migration/migration.dtd
@@ -1,51 +1,35 @@
 
-<!ENTITY migrationWizard.title "āχāĻŽāĻĒā§‹āĻ°ā§āϟ āωāχāϜāĻžāĻ°ā§āĻĄ">
+<!ENTITY migrationWizard.title          "āχāĻŽāĻĒā§‹āĻ°ā§āϟ āωāχāϜāĻžāĻ°ā§āĻĄ">
 
-<!ENTITY importFrom.label "āωāĻ˛ā§āϞ⧇āĻ–āĻŋāϤ āĻ¸ā§āĻĨāĻžāύ āĻĨ⧇āϕ⧇ āĻ…āĻĒāĻļāύāϏāĻŽā§‚āĻš, āĻŦ⧁āĻ•āĻŽāĻžāĻ°ā§āĻ•, āχāϤāĻŋāĻšāĻžāϏ, āĻĒāĻžāϏāĻ“ā§ŸāĻžāĻ°ā§āĻĄ āĻ“ āĻ…āĻ¨ā§āϝāĻžāĻ¨ā§āϝ āϤāĻĨā§āϝ āχāĻŽāĻĒā§‹āĻ°ā§āϟ āĻ•āϰāĻž āĻšāĻŦ⧇:">
-<!ENTITY importFromUnix.label "āωāĻ˛ā§āϞ⧇āĻ–āĻŋāϤ āĻ¸ā§āĻĨāĻžāύ āĻĨ⧇āϕ⧇ āĻĒāĻ›āĻ¨ā§āĻĻāϏāĻŽā§‚āĻš, āĻŦ⧁āĻ•āĻŽāĻžāĻ°ā§āĻ•, āχāϤāĻŋāĻšāĻžāϏ, āĻĒāĻžāϏāĻ“ā§ŸāĻžāĻ°ā§āĻĄ āĻ“ āĻ…āĻ¨ā§āϝāĻžāĻ¨ā§āϝ āϤāĻĨā§āϝ āχāĻŽāĻĒā§‹āĻ°ā§āϟ āĻ•āϰāĻž āĻšāĻŦ⧇:">
-<!ENTITY importFromBookmarks.label "āωāĻ˛ā§āϞ⧇āĻ–āĻŋāϤ āĻ¸ā§āĻĨāĻžāύ āĻĨ⧇āϕ⧇ āĻŦ⧁āĻ•āĻŽāĻžāĻ°ā§āĻ• āχāĻŽāĻĒā§‹āĻ°ā§āϟ āĻ•āϰāĻž āĻšāĻŦ⧇:">
+<!ENTITY importFrom.label               "āωāĻ˛ā§āϞ⧇āĻ–āĻŋāϤ āĻ¸ā§āĻĨāĻžāύ āĻĨ⧇āϕ⧇ āĻ…āĻĒāĻļāύāϏāĻŽā§‚āĻš, āĻŦ⧁āĻ•āĻŽāĻžāĻ°ā§āĻ•, āχāϤāĻŋāĻšāĻžāϏ, āĻĒāĻžāϏāĻ“ā§ŸāĻžāĻ°ā§āĻĄ āĻ“ āĻ…āĻ¨ā§āϝāĻžāĻ¨ā§āϝ āϤāĻĨā§āϝ āχāĻŽāĻĒā§‹āĻ°ā§āϟ āĻ•āϰāĻž āĻšāĻŦ⧇:">
+<!ENTITY importFromUnix.label           "āωāĻ˛ā§āϞ⧇āĻ–āĻŋāϤ āĻ¸ā§āĻĨāĻžāύ āĻĨ⧇āϕ⧇ āĻĒāĻ›āĻ¨ā§āĻĻāϏāĻŽā§‚āĻš, āĻŦ⧁āĻ•āĻŽāĻžāĻ°ā§āĻ•, āχāϤāĻŋāĻšāĻžāϏ, āĻĒāĻžāϏāĻ“ā§ŸāĻžāĻ°ā§āĻĄ āĻ“ āĻ…āĻ¨ā§āϝāĻžāĻ¨ā§āϝ āϤāĻĨā§āϝ āχāĻŽāĻĒā§‹āĻ°ā§āϟ āĻ•āϰāĻž āĻšāĻŦ⧇:">
+<!ENTITY importFromBookmarks.label      "āωāĻ˛ā§āϞ⧇āĻ–āĻŋāϤ āĻ¸ā§āĻĨāĻžāύ āĻĨ⧇āϕ⧇ āĻŦ⧁āĻ•āĻŽāĻžāĻ°ā§āĻ• āχāĻŽāĻĒā§‹āĻ°ā§āϟ āĻ•āϰāĻž āĻšāĻŦ⧇:">
 
-<!ENTITY importFromIE.label "āĻŽāĻžāχāĻ•ā§āϰ⧋āϏāĻĢāϟ āχāĻ¨ā§āϟāĻžāϰāύ⧇āϟ āĻāĻ•ā§āϏāĻĒā§āϞ⧋āϰāĻžāϰ (M)">
-<!ENTITY importFromIE.accesskey "M">
-<!ENTITY importFromPhoenix.label "āĻĢāĻžā§ŸāĻžāϰāĻĢāĻ•ā§āϏ 0.8, āĻĢāĻžā§ŸāĻžāϰāĻŦāĻžāĻ°ā§āĻĄ āĻŦāĻž āĻĢāĻŋāύāĻŋāĻ•ā§āϏ (P)">
-<!ENTITY importFromPhoenix.accesskey "P">
-<!ENTITY importFromNothing.label "āĻ•āĻŋāϛ⧁āχ āχāĻŽāĻĒā§‹āĻ°ā§āϟ āĻ•āϰāĻž āĻšāĻŦ⧇ āύāĻž (D)">
-<!ENTITY importFromNothing.accesskey "D">
-<!ENTITY importFromSeamonkey.label "āύ⧇āϟāĻ¸ā§āϕ⧇āĻĒ 6, 7 āĻŦāĻž āĻŽā§‹āϜāĻŋāϞāĻž ā§§.x (N)">
-<!ENTITY importFromSeamonkey.accesskey "N">
-<!ENTITY importFromNetscape4.label "āύ⧇āϟāĻ¸ā§āϕ⧇āĻĒ 4.x">
-<!ENTITY importFromNetscape4.accesskey "4">
-<!ENTITY importFromOpera.label "āĻ…āĻĒ⧇āϰāĻž (O)">
-<!ENTITY importFromOpera.accesskey "O">
-<!ENTITY importFromCamino.label "āĻ•ā§āϝāĻžāĻŽāĻŋāύ⧋ (C)">
-<!ENTITY importFromCamino.accesskey "C">
-<!ENTITY importFromSafari.label "āϏāĻžāĻĢāĻžāϰāĻŋ (S)">
-<!ENTITY importFromSafari.accesskey "S">
-<!ENTITY importFromOmniWeb.label "āĻ…āĻŽāύāĻŋāĻ“ā§Ÿā§‡āĻŦ (W)">
-<!ENTITY importFromOmniWeb.accesskey "W">
-<!ENTITY importFromICab.label "āφāχāĻ•ā§āϝāĻžāĻŦ (i)">
-<!ENTITY importFromICab.accesskey "i">
-<!ENTITY importFromKonqueror.label "āĻ•āύāĻ•ā§‹ā§Ÿā§‡āϰāĻžāϰ (K)">
-<!ENTITY importFromKonqueror.accesskey "K">
-<!ENTITY importFromEpiphany.label "āĻāĻĒāĻŋāĻĢ⧇āύāĻŋ (E)">
-<!ENTITY importFromEpiphany.accesskey "E">
-<!ENTITY importFromGaleon.label "āĻ—ā§āϝāĻžāϞāĻŋāĻ“āύ (G)">
-<!ENTITY importFromGaleon.accesskey "G">
-<!ENTITY importFromHTMLFile.label "HTML āĻĢāĻžāχāϞ āĻĨ⧇āϕ⧇ (F)">
-<!ENTITY importFromHTMLFile.accesskey "F">
+<!ENTITY importFromIE.label             "āĻŽāĻžāχāĻ•ā§āϰ⧋āϏāĻĢāϟ āχāĻ¨ā§āϟāĻžāϰāύ⧇āϟ āĻāĻ•ā§āϏāĻĒā§āϞ⧋āϰāĻžāϰ (M)">
+<!ENTITY importFromIE.accesskey         "M">
+<!ENTITY importFromNothing.label        "āĻ•āĻŋāϛ⧁āχ āχāĻŽāĻĒā§‹āĻ°ā§āϟ āĻ•āϰāĻž āĻšāĻŦ⧇ āύāĻž (D)">
+<!ENTITY importFromNothing.accesskey    "D">
+<!ENTITY importFromSeamonkey.label      "āύ⧇āϟāĻ¸ā§āϕ⧇āĻĒ 6, 7 āĻŦāĻž āĻŽā§‹āϜāĻŋāϞāĻž ā§§.x (N)">
+<!ENTITY importFromSeamonkey.accesskey  "N">
+<!ENTITY importFromOpera.label          "āĻ…āĻĒ⧇āϰāĻž (O)">
+<!ENTITY importFromOpera.accesskey      "O">
+<!ENTITY importFromSafari.label         "āϏāĻžāĻĢāĻžāϰāĻŋ (S)">
+<!ENTITY importFromSafari.accesskey     "S">
+<!ENTITY importFromHTMLFile.label       "HTML āĻĢāĻžāχāϞ āĻĨ⧇āϕ⧇ (F)">
+<!ENTITY importFromHTMLFile.accesskey   "F">
 
-<!ENTITY noMigrationSources.label "āĻŦ⧁āĻ•āĻŽāĻžāĻ°ā§āĻ•, āχāϤāĻŋāĻšāĻžāϏ āĻ…āĻĨāĻŦāĻž āĻĒāĻžāϏāĻ“ā§ŸāĻžāĻ°ā§āĻĄ āϧāĻžāϰāĻŖāĻ•āĻžāϰ⧀ āϕ⧋āύ⧋ āĻĒā§āϰ⧋āĻ—ā§āϰāĻžāĻŽ āĻĒāĻžāĻ“ā§ŸāĻž āϝāĻžā§ŸāύāĻŋāĨ¤">
+<!ENTITY noMigrationSources.label       "āĻŦ⧁āĻ•āĻŽāĻžāĻ°ā§āĻ•, āχāϤāĻŋāĻšāĻžāϏ āĻ…āĻĨāĻŦāĻž āĻĒāĻžāϏāĻ“ā§ŸāĻžāĻ°ā§āĻĄ āϧāĻžāϰāĻŖāĻ•āĻžāϰ⧀ āϕ⧋āύ⧋ āĻĒā§āϰ⧋āĻ—ā§āϰāĻžāĻŽ āĻĒāĻžāĻ“ā§ŸāĻž āϝāĻžā§ŸāύāĻŋāĨ¤">
 
-<!ENTITY importSource.title "āωāĻ˛ā§āϞ⧇āĻ–āĻŋāϤ āĻ¸ā§āĻĨāĻžāύ āĻĨ⧇āϕ⧇ āϏ⧇āϟāĻŋāĻ‚āϏāĻŽā§‚āĻš āĻ“ āϤāĻĨā§āϝ āχāĻŽāĻĒā§‹āĻ°ā§āϟ āĻ•āϰāĻž āĻšāĻŦ⧇">
-<!ENTITY importItems.title "āχāĻŽāĻĒā§‹āĻ°ā§āϟ āĻ•āϰāĻž āĻšāĻŦ⧇">
-<!ENTITY importItems.label "āχāĻŽāĻĒā§‹āĻ°ā§āϟ āĻ•āϰāĻžāϰ āϜāĻ¨ā§āϝ āφāχāĻŸā§‡āĻŽ āύāĻŋāĻ°ā§āĻŦāĻžāϚāύ:">
+<!ENTITY importSource.title             "āωāĻ˛ā§āϞ⧇āĻ–āĻŋāϤ āĻ¸ā§āĻĨāĻžāύ āĻĨ⧇āϕ⧇ āϏ⧇āϟāĻŋāĻ‚āϏāĻŽā§‚āĻš āĻ“ āϤāĻĨā§āϝ āχāĻŽāĻĒā§‹āĻ°ā§āϟ āĻ•āϰāĻž āĻšāĻŦ⧇">
+<!ENTITY importItems.title              "āχāĻŽāĻĒā§‹āĻ°ā§āϟ āĻ•āϰāĻž āĻšāĻŦ⧇">
+<!ENTITY importItems.label              "āχāĻŽāĻĒā§‹āĻ°ā§āϟ āĻ•āϰāĻžāϰ āϜāĻ¨ā§āϝ āφāχāĻŸā§‡āĻŽ āύāĻŋāĻ°ā§āĻŦāĻžāϚāύ:">
 
-<!ENTITY migrating.title "āχāĻŽāĻĒā§‹āĻ°ā§āϟ āĻ•āϰāĻž āĻšāĻšā§āϛ⧇...">
-<!ENTITY migrating.label "āĻŦāĻ°ā§āϤāĻŽāĻžāύ⧇ āύāĻŋāĻŽā§āύāϞāĻŋāĻ–āĻŋāϤ āφāχāĻŸā§‡āĻŽ āχāĻŽāĻĒā§‹āĻ°ā§āϟ āĻ•āϰāĻž āĻšāĻšā§āϛ⧇...">
+<!ENTITY migrating.title                "āχāĻŽāĻĒā§‹āĻ°ā§āϟ āĻ•āϰāĻž āĻšāĻšā§āϛ⧇...">
+<!ENTITY migrating.label                "āĻŦāĻ°ā§āϤāĻŽāĻžāύ⧇ āύāĻŋāĻŽā§āύāϞāĻŋāĻ–āĻŋāϤ āφāχāĻŸā§‡āĻŽ āχāĻŽāĻĒā§‹āĻ°ā§āϟ āĻ•āϰāĻž āĻšāĻšā§āϛ⧇...">
 
-<!ENTITY selectProfile.title "āĻĒā§āϰ⧋āĻĢāĻžāχāϞ āύāĻŋāĻ°ā§āĻŦāĻžāϚāύ">
-<!ENTITY selectProfile.label "āύāĻŋāĻŽā§āύāϞāĻŋāĻ–āĻŋāϤ āĻĒā§āϰ⧋āĻĢāĻžāχāϞāϗ⧁āϞāĻŋ āĻĨ⧇āϕ⧇ āĻŦāĻ°ā§āϤāĻŽāĻžāύ⧇ āχāĻŽāĻĒā§‹āĻ°ā§āϟ āĻ•āϰāĻž āϏāĻŽā§āĻ­āĻŦ:">
+<!ENTITY selectProfile.title            "āĻĒā§āϰ⧋āĻĢāĻžāχāϞ āύāĻŋāĻ°ā§āĻŦāĻžāϚāύ">
+<!ENTITY selectProfile.label            "āύāĻŋāĻŽā§āύāϞāĻŋāĻ–āĻŋāϤ āĻĒā§āϰ⧋āĻĢāĻžāχāϞāϗ⧁āϞāĻŋ āĻĨ⧇āϕ⧇ āĻŦāĻ°ā§āϤāĻŽāĻžāύ⧇ āχāĻŽāĻĒā§‹āĻ°ā§āϟ āĻ•āϰāĻž āϏāĻŽā§āĻ­āĻŦ:">
 
-<!ENTITY done.title "āχāĻŽāĻĒā§‹āĻ°ā§āϟ āϏāĻŽāĻžāĻĒā§āϤ">
-<!ENTITY done.label "āύāĻŋāĻŽā§āύāϞāĻŋāĻ–āĻŋāϤ āφāχāĻŸā§‡āĻŽā§‡āϰ āχāĻŽāĻĒā§‹āĻ°ā§āϟ āϏāĻĢāϞ āĻšā§Ÿā§‡āϛ⧇:">
+<!ENTITY done.title                     "āχāĻŽāĻĒā§‹āĻ°ā§āϟ āϏāĻŽāĻžāĻĒā§āϤ">
+<!ENTITY done.label                     "āύāĻŋāĻŽā§āύāϞāĻŋāĻ–āĻŋāϤ āφāχāĻŸā§‡āĻŽā§‡āϰ āχāĻŽāĻĒā§‹āĻ°ā§āϟ āϏāĻĢāϞ āĻšā§Ÿā§‡āϛ⧇:">
 
--- a/browser/chrome/browser/migration/migration.properties
+++ b/browser/chrome/browser/migration/migration.properties
@@ -1,83 +1,54 @@
 profileName_format=%S %S
 
 # Browser Specific
 sourceNameIE=āχāĻ¨ā§āϟāĻžāϰāύ⧇āϟ āĻāĻ•ā§āϏāĻĒā§āϞ⧋āϰāĻžāϰ
 sourceNameSeamonkey=āύ⧇āϟāĻ¸ā§āϕ⧇āĻĒ  6/7/āĻŽā§‹āϜāĻŋāϞāĻž
-sourceNameDogbert=āύ⧇āϟāĻ¸ā§āϕ⧇āĻĒ 4
 sourceNameOpera=āĻ…āĻĒ⧇āϰāĻž
 sourceNameSafari=āϏāĻžāĻĢāĻžāϰāĻŋ
-sourceNameOmniWeb=āĻ…āĻŽāύāĻŋāĻ“ā§Ÿā§‡āĻŦ
-sourceNameCamino=āĻ•ā§āϝāĻžāĻŽāĻŋāύ⧋
-sourceNameICab=āφāχāĻ•ā§āϝāĻžāĻŦ
-sourceNameKonqueror=āĻ•āύāĻ•ā§‹ā§Ÿā§‡āϰāĻžāϰ
-sourceNameEpiphany=āĻāĻĒāĻŋāĻĢ⧇āύāĻŋ
-sourceNameGaleon=āĻ—ā§āϝāĻžāϞāĻŋāĻ“āύ
 
 importedBookmarksFolder=%S āĻĨ⧇āϕ⧇
 importedSearchURLsFolder=āϕ⧀āĻ“ā§ŸāĻžāĻ°ā§āĻĄ āĻ…āύ⧁āϏāĻ¨ā§āϧāĻžāύ (%S āĻĨ⧇āϕ⧇)
 importedSearchURLsTitle=%S-āϰ āωāĻĒāϰ āĻ…āύ⧁āϏāĻ¨ā§āϧāĻžāύ
 importedSearchUrlDesc=%2$S-āĻ āĻ…āύ⧁āϏāĻ¨ā§āϧāĻžāύ āĻ•āϰāϤ⧇ āĻšāϞ⧇ āĻ āĻŋāĻ•āĻžāύāĻž āĻŦāĻžāϰ⧇ "%1$S <āĻ…āύ⧁āϏāĻ¨ā§āϧāĻžāύ⧇āϰ āĻŦāĻŋāώ⧟āĻŦāĻ¸ā§āϤ⧁>" āϞāĻŋāϖ⧁āύāĨ¤
 
-importedDogbertBookmarksTitle=āύ⧇āϟāĻ¸ā§āϕ⧇āĻĒ 4 āĻĨ⧇āϕ⧇
 importedSeamonkeyBookmarksTitle=āύ⧇āϟāĻ¸ā§āϕ⧇āĻĒ 6/7/āĻŽā§‹āϜāĻŋāϞāĻž āĻĨ⧇āϕ⧇
 importedSafariBookmarks=āϏāĻžāĻĢāĻžāϰāĻŋ āĻĨ⧇āϕ⧇
 importedOperaHotlistTitle=āĻ…āĻĒ⧇āϰāĻž āĻĨ⧇āϕ⧇
 importedOperaSearchUrls=āϕ⧀āĻ“ā§ŸāĻžāĻ°ā§āĻĄ āĻ…āύ⧁āϏāĻžāϰ⧇ āĻ…āύ⧁āϏāĻ¨ā§āϧāĻžāύ (āĻ…āĻĒ⧇āϰāĻž āĻĨ⧇āϕ⧇)
 
 # Import Sources
 1_ie=āχāĻ¨ā§āϟāĻžāϰāύ⧇āϟ āĻ…āĻĒāĻļāύ
 1_opera=āĻĒāĻ›āĻ¨ā§āĻĻāϏāĻŽā§‚āĻš
-1_dogbert=āĻĒāĻ›āĻ¨ā§āĻĻāϏāĻŽā§‚āĻš
 1_seamonkey=āĻĒāĻ›āĻ¨ā§āĻĻāϏāĻŽā§‚āĻš
-1_phoenix=āĻĒāĻ›āĻ¨ā§āĻĻāϏāĻŽā§‚āĻš
 1_safari=āĻĒāĻ›āĻ¨ā§āĻĻāϏāĻŽā§‚āĻš
-1_macie=āĻĒāĻ›āĻ¨ā§āĻĻāϏāĻŽā§‚āĻš
 
 2_ie=āϕ⧁āĻ•āĻŋ
 2_opera=āϕ⧁āĻ•āĻŋ
-2_dogbert=āϕ⧁āĻ•āĻŋ
 2_seamonkey=āϕ⧁āĻ•āĻŋ
-2_phoenix=āϕ⧁āĻ•āĻŋ
 2_safari=āϕ⧁āĻ•āĻŋ
-2_macie=āϕ⧁āĻ•āĻŋ
 
 4_ie=āĻŦā§āϰāĻžāωāϜ āχāϤāĻŋāĻšāĻžāϏ
 4_opera=āĻŦā§āϰāĻžāωāϜ āχāϤāĻŋāĻšāĻžāϏ
-4_dogbert=āĻŦā§āϰāĻžāωāϜ āχāϤāĻŋāĻšāĻžāϏ
 4_seamonkey=āĻŦā§āϰāĻžāωāϜ āχāϤāĻŋāĻšāĻžāϏ
-4_phoenix=āĻŦā§āϰāĻžāωāϜ āχāϤāĻŋāĻšāĻžāϏ
 4_safari=āĻŦā§āϰāĻžāωāϜ āχāϤāĻŋāĻšāĻžāϏ
-4_macie=āĻŦā§āϰāĻžāωāϜ āχāϤāĻŋāĻšāĻžāϏ
 
 8_ie=āϏāĻ‚āϰāĻ•ā§āώāĻŋāϤ āĻĢāϰāĻŽā§‡āϰ āχāϤāĻŋāĻšāĻžāϏ
 8_opera=āϏāĻ‚āϰāĻ•ā§āώāĻŋāϤ āĻĢāϰāĻŽā§‡āϰ āχāϤāĻŋāĻšāĻžāϏ
-8_dogbert=āϏāĻ‚āϰāĻ•ā§āώāĻŋāϤ āĻĢāϰāĻŽā§‡āϰ āχāϤāĻŋāĻšāĻžāϏ
 8_seamonkey=āϏāĻ‚āϰāĻ•ā§āώāĻŋāϤ āĻĢāϰāĻŽā§‡āϰ āχāϤāĻŋāĻšāĻžāϏ
-8_phoenix=āϏāĻ‚āϰāĻ•ā§āώāĻŋāϤ āĻĢāϰāĻŽā§‡āϰ āχāϤāĻŋāĻšāĻžāϏ
 8_safari=āϏāĻ‚āϰāĻ•ā§āώāĻŋāϤ āĻĢāϰāĻŽā§‡āϰ āχāϤāĻŋāĻšāĻžāϏ
-8_macie=āϏāĻ‚āϰāĻ•ā§āώāĻŋāϤ āĻĢāϰāĻŽā§‡āϰ āχāϤāĻŋāĻšāĻžāϏ
 
 16_ie=āϏāĻ‚āϰāĻ•ā§āώāĻŋāϤ āĻĒāĻžāϏāĻ“ā§ŸāĻžāĻ°ā§āĻĄ
 16_opera=āϏāĻ‚āϰāĻ•ā§āώāĻŋāϤ āĻĒāĻžāϏāĻ“ā§ŸāĻžāĻ°ā§āĻĄ
-16_dogbert=āϏāĻ‚āϰāĻ•ā§āώāĻŋāϤ āĻĒāĻžāϏāĻ“ā§ŸāĻžāĻ°ā§āĻĄ
 16_seamonkey=āϏāĻ‚āϰāĻ•ā§āώāĻŋāϤ āĻĒāĻžāϏāĻ“ā§ŸāĻžāĻ°ā§āĻĄ
-16_phoenix=āϏāĻ‚āϰāĻ•ā§āώāĻŋāϤ āĻĒāĻžāϏāĻ“ā§ŸāĻžāĻ°ā§āĻĄ
 16_safari=āϏāĻ‚āϰāĻ•ā§āώāĻŋāϤ āĻĒāĻžāϏāĻ“ā§ŸāĻžāĻ°ā§āĻĄ
-16_macie=āϏāĻ‚āϰāĻ•ā§āώāĻŋāϤ āĻĒāĻžāϏāĻ“ā§ŸāĻžāĻ°ā§āĻĄ
 
 32_ie=āĻĒā§āϰāĻŋ⧟
 32_opera=āĻŦ⧁āĻ•āĻŽāĻžāĻ°ā§āĻ•
-32_dogbert=āĻŦ⧁āĻ•āĻŽāĻžāĻ°ā§āĻ•
 32_seamonkey=āĻŦ⧁āĻ•āĻŽāĻžāĻ°ā§āĻ•
-32_phoenix=āĻŦ⧁āĻ•āĻŽāĻžāĻ°ā§āĻ•
 32_safari=āĻŦ⧁āĻ•āĻŽāĻžāĻ°ā§āĻ•
-32_macie=āĻĒā§āϰāĻŋ⧟
 
 64_ie=āĻ…āĻ¨ā§āϝāĻžāĻ¨ā§āϝ āϤāĻĨā§āϝ
 64_opera=āĻ…āĻ¨ā§āϝāĻžāĻ¨ā§āϝ āϤāĻĨā§āϝ
-64_dogbert=āĻ…āĻ¨ā§āϝāĻžāĻ¨ā§āϝ āϤāĻĨā§āϝ
 64_seamonkey=āĻ…āĻ¨ā§āϝāĻžāĻ¨ā§āϝ āϤāĻĨā§āϝ
-64_phoenix=āĻ…āĻ¨ā§āϝāĻžāĻ¨ā§āϝ āϤāĻĨā§āϝ
 64_safari=āĻ…āĻ¨ā§āϝāĻžāĻ¨ā§āϝ āϤāĻĨā§āϝ
-64_macie=āĻ…āĻ¨ā§āϝāĻžāĻ¨ā§āϝ āϤāĻĨā§āϝ
 
--- a/browser/chrome/browser/pageInfo.dtd
+++ b/browser/chrome/browser/pageInfo.dtd
@@ -32,97 +32,97 @@
 # decision by deleting the provisions above and replace them with the notice
 # and other provisions required by the LGPL or the GPL. If you do not delete
 # the provisions above, a recipient may use your version of this file under
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
 -->
 
-<!ENTITY pageInfoWindow.width "600">
-<!ENTITY pageInfoWindow.height "700">
+<!ENTITY  pageInfoWindow.width  "600">
+<!ENTITY  pageInfoWindow.height "700">
 
-<!ENTITY copy.key "C">
-<!ENTITY copy.label "āĻ…āύ⧁āϞāĻŋāĻĒāĻŋ (C)">
-<!ENTITY copy.accesskey "C">
-<!ENTITY selectall.key "A">
-<!ENTITY selectall.label "āϏāĻŦ āύāĻŋāĻ°ā§āĻŦāĻžāϚāύ (A)">
-<!ENTITY selectall.accesskey "A">
-<!ENTITY closeWindow.key "w">
+<!ENTITY  copy.key              "C">
+<!ENTITY  copy.label            "āĻ…āύ⧁āϞāĻŋāĻĒāĻŋ (C)">
+<!ENTITY  copy.accesskey        "C">
+<!ENTITY  selectall.key         "A">
+<!ENTITY  selectall.label       "āϏāĻŦ āύāĻŋāĻ°ā§āĻŦāĻžāϚāύ (A)">
+<!ENTITY  selectall.accesskey   "A">
+<!ENTITY  closeWindow.key       "w">
 
-<!ENTITY generalTab "āϏāĻžāϧāĻžāϰāĻŖ">
-<!ENTITY generalTab.accesskey "G">
-<!ENTITY generalURL "āĻ āĻŋāĻ•āĻžāύāĻž:">
-<!ENTITY generalType "āĻļā§āϰ⧇āĻŖā§€:">
-<!ENTITY generalMode "āϰ⧇āĻ¨ā§āĻĄāĻžāϰ āĻŽā§‹āĻĄ:">
-<!ENTITY generalSize "āφāĻ•āĻžāϰ:">
-<!ENTITY generalReferrer "āύāĻŋāĻ°ā§āĻĻ⧇āĻļāĻ•āĻžāϰ⧀ URL:">
-<!ENTITY generalSource "āĻ•ā§āϝāĻžāĻļ⧇āϰ āĻ‰ā§ŽāϏ:">
-<!ENTITY generalModified "āĻĒāϰāĻŋāĻŦāĻ°ā§āϤāĻŋāϤ:">
-<!ENTITY generalEncoding "āĻāύāϕ⧋āĻĄāĻŋāĻ‚:">
-<!ENTITY generalMetaName "āύāĻžāĻŽ">
-<!ENTITY generalMetaContent "āĻŦāĻŋāώ⧟āĻŦāĻ¸ā§āϤ⧁">
-<!ENTITY generalSecurityDetails "āĻŦāĻŋāĻŦāϰāĻŖ (D)">
-<!ENTITY generalSecurityDetails.accesskey "D">
+<!ENTITY  generalTab            "āϏāĻžāϧāĻžāϰāĻŖ">
+<!ENTITY  generalTab.accesskey  "G">
+<!ENTITY  generalURL            "āĻ āĻŋāĻ•āĻžāύāĻž:">
+<!ENTITY  generalType           "āĻļā§āϰ⧇āĻŖā§€:">
+<!ENTITY  generalMode           "āϰ⧇āĻ¨ā§āĻĄāĻžāϰ āĻŽā§‹āĻĄ:">
+<!ENTITY  generalSize           "āφāĻ•āĻžāϰ:">
+<!ENTITY  generalReferrer       "āύāĻŋāĻ°ā§āĻĻ⧇āĻļāĻ•āĻžāϰ⧀ URL:">
+<!ENTITY  generalSource         "āĻ•ā§āϝāĻžāĻļ⧇āϰ āĻ‰ā§ŽāϏ:">
+<!ENTITY  generalModified       "āĻĒāϰāĻŋāĻŦāĻ°ā§āϤāĻŋāϤ:">
+<!ENTITY  generalEncoding       "āĻāύāϕ⧋āĻĄāĻŋāĻ‚:">
+<!ENTITY  generalMetaName       "āύāĻžāĻŽ">
+<!ENTITY  generalMetaContent    "āĻŦāĻŋāώ⧟āĻŦāĻ¸ā§āϤ⧁">
+<!ENTITY  generalSecurityDetails   "āĻŦāĻŋāĻŦāϰāĻŖ (D)">
+<!ENTITY  generalSecurityDetails.accesskey "D">
 
-<!ENTITY mediaTab "āĻŽāĻŋāĻĄāĻŋ⧟āĻž (M)">
-<!ENTITY mediaTab.accesskey "M">
-<!ENTITY mediaLocation "āĻ…āĻŦāĻ¸ā§āĻĨāĻžāύ:">
-<!ENTITY mediaText "āϏāĻ‚āĻļā§āϞāĻŋāĻˇā§āϟ āĻŸā§‡āĻ•ā§āϏāϟ:">
-<!ENTITY mediaAltHeader "āĻŦāĻŋāĻ•āĻ˛ā§āĻĒ āĻŸā§‡āĻ•ā§āϏāϟ:">
-<!ENTITY mediaAddress "āĻ āĻŋāĻ•āĻžāύāĻž">
-<!ENTITY mediaType "āĻļā§āϰ⧇āĻŖā§€">
-<!ENTITY mediaSize "āφāĻ•āĻžāϰ">
-<!ENTITY mediaCount "āĻŽā§‹āϟ">
-<!ENTITY mediaDimension "āĻŽāĻžāĻ¤ā§āϰāĻž:">
-<!ENTITY mediaLongdesc "āĻŦāĻŋāĻ¸ā§āϤāĻžāϰāĻŋāϤ āĻŦāĻŋāĻŦāϰāĻŖ:">
-<!ENTITY mediaBlockImage.accesskey "B">
-<!ENTITY mediaSaveAs "āĻ…āĻ¨ā§āϝāĻ­āĻžāĻŦ⧇ āϏāĻ‚āϰāĻ•ā§āώāĻŖ... (A)">
-<!ENTITY mediaSaveAs.accesskey "A">
-<!ENTITY mediaSaveAs2.accesskey "e">
-<!ENTITY mediaPreview "āĻŽāĻŋāĻĄāĻŋ⧟āĻžāϰ āĻĒā§āϰāĻžāĻ•āĻĻāĻ°ā§āĻļāύ:">
+<!ENTITY  mediaTab              "āĻŽāĻŋāĻĄāĻŋ⧟āĻž (M)">
+<!ENTITY  mediaTab.accesskey    "M">
+<!ENTITY  mediaLocation         "āĻ…āĻŦāĻ¸ā§āĻĨāĻžāύ:">
+<!ENTITY  mediaText             "āϏāĻ‚āĻļā§āϞāĻŋāĻˇā§āϟ āĻŸā§‡āĻ•ā§āϏāϟ:">
+<!ENTITY  mediaAltHeader        "āĻŦāĻŋāĻ•āĻ˛ā§āĻĒ āĻŸā§‡āĻ•ā§āϏāϟ:">
+<!ENTITY  mediaAddress          "āĻ āĻŋāĻ•āĻžāύāĻž">
+<!ENTITY  mediaType             "āĻļā§āϰ⧇āĻŖā§€">
+<!ENTITY  mediaSize             "āφāĻ•āĻžāϰ">
+<!ENTITY  mediaCount            "āĻŽā§‹āϟ">
+<!ENTITY  mediaDimension        "āĻŽāĻžāĻ¤ā§āϰāĻž:">
+<!ENTITY  mediaLongdesc         "āĻŦāĻŋāĻ¸ā§āϤāĻžāϰāĻŋāϤ āĻŦāĻŋāĻŦāϰāĻŖ:">
+<!ENTITY  mediaBlockImage.accesskey "B">
+<!ENTITY  mediaSaveAs           "āĻ…āĻ¨ā§āϝāĻ­āĻžāĻŦ⧇ āϏāĻ‚āϰāĻ•ā§āώāĻŖ... (A)">
+<!ENTITY  mediaSaveAs.accesskey "A">
+<!ENTITY  mediaSaveAs2.accesskey "e">
+<!ENTITY  mediaPreview          "āĻŽāĻŋāĻĄāĻŋ⧟āĻžāϰ āĻĒā§āϰāĻžāĻ•āĻĻāĻ°ā§āĻļāύ:">
 
-<!ENTITY feedTab "āĻĢāĻŋāĻĄ (F)">
-<!ENTITY feedTab.accesskey "F">
-<!ENTITY feedSubscribe "āϏāĻžāĻŦāĻ¸ā§āĻ•ā§āϰāĻžāχāĻŦ (U)">
-<!ENTITY feedSubscribe.accesskey "u">
+<!ENTITY  feedTab               "āĻĢāĻŋāĻĄ (F)">
+<!ENTITY  feedTab.accesskey     "F">
+<!ENTITY  feedSubscribe         "āϏāĻžāĻŦāĻ¸ā§āĻ•ā§āϰāĻžāχāĻŦ (U)">
+<!ENTITY  feedSubscribe.accesskey "u">
 
-<!ENTITY permTab "āĻ…āύ⧁āĻŽā§‹āĻĻāύ (P)">
-<!ENTITY permTab.accesskey "P">
-<!ENTITY permUseDefault "āĻĄāĻŋāĻĢāĻ˛ā§āϟ āĻŦā§āϝāĻŦāĻšāĻžāϰ āĻ•āϰāĻž āĻšāĻŦ⧇">
-<!ENTITY permAskAlways "āϏāĻŦāϏāĻŽā§Ÿ āϜāĻŋāĻœā§āĻžā§‡āϏ āĻ•āϰāĻž āĻšāĻŦ⧇">
-<!ENTITY permAllow "āĻ…āύ⧁āĻŽā§‹āĻĻāύ āĻ•āϰāĻž āĻšāĻŦ⧇">
-<!ENTITY permAllowSession "āĻāχ āϏ⧇āĻļāύ⧇āϰ āϜāĻ¨ā§āϝ āĻ…āύ⧁āĻŽā§‹āĻĻāύ āĻ•āϰāĻž āĻšāĻŦ⧇">
-<!ENTITY permBlock "āĻĒā§āϰāϤāĻŋāϰ⧋āϧ āĻ•āϰāĻž āĻšāĻŦ⧇">
-<!ENTITY permissionsFor "āĻ…āύ⧁āĻŽā§‹āĻĻāύ:">
-<!ENTITY permImage "āĻ›āĻŦāĻŋ āϞ⧋āĻĄ āĻ•āϰāĻž">
-<!ENTITY permPopup "āĻĒāĻĒ-āφāĻĒ āωāχāĻ¨ā§āĻĄā§‹ āĻ–ā§‹āϞāĻž">
-<!ENTITY permCookie "āϕ⧁āĻ•āĻŋ āύāĻŋāĻ°ā§āϧāĻžāϰāĻŖ">
-<!ENTITY permInstall "āĻāĻ•ā§āϏāĻŸā§‡āύāĻļāύ āĻŦāĻž āĻĨā§€āĻŽ āχāύāĻ¸ā§āϟāϞ⧇āĻļāύ">
-<!ENTITY permGeo "āĻļā§‡ā§ŸāĻžāϰ āĻ…āĻŦāĻ¸ā§āĻĨāĻžāύ">
+<!ENTITY  permTab               "āĻ…āύ⧁āĻŽā§‹āĻĻāύ (P)">
+<!ENTITY  permTab.accesskey     "P">
+<!ENTITY  permUseDefault        "āĻĄāĻŋāĻĢāĻ˛ā§āϟ āĻŦā§āϝāĻŦāĻšāĻžāϰ āĻ•āϰāĻž āĻšāĻŦ⧇">
+<!ENTITY  permAskAlways         "āϏāĻŦāϏāĻŽā§Ÿ āϜāĻŋāĻœā§āĻžā§‡āϏ āĻ•āϰāĻž āĻšāĻŦ⧇">
+<!ENTITY  permAllow             "āĻ…āύ⧁āĻŽā§‹āĻĻāύ āĻ•āϰāĻž āĻšāĻŦ⧇">
+<!ENTITY  permAllowSession      "āĻāχ āϏ⧇āĻļāύ⧇āϰ āϜāĻ¨ā§āϝ āĻ…āύ⧁āĻŽā§‹āĻĻāύ āĻ•āϰāĻž āĻšāĻŦ⧇">
+<!ENTITY  permBlock             "āĻĒā§āϰāϤāĻŋāϰ⧋āϧ āĻ•āϰāĻž āĻšāĻŦ⧇">
+<!ENTITY  permissionsFor        "āĻ…āύ⧁āĻŽā§‹āĻĻāύ:">
+<!ENTITY  permImage             "āĻ›āĻŦāĻŋ āϞ⧋āĻĄ āĻ•āϰāĻž">
+<!ENTITY  permPopup             "āĻĒāĻĒ-āφāĻĒ āωāχāĻ¨ā§āĻĄā§‹ āĻ–ā§‹āϞāĻž">
+<!ENTITY  permCookie            "āϕ⧁āĻ•āĻŋ āύāĻŋāĻ°ā§āϧāĻžāϰāĻŖ">
+<!ENTITY  permInstall           "āĻāĻ•ā§āϏāĻŸā§‡āύāĻļāύ āĻŦāĻž āĻĨā§€āĻŽ āχāύāĻ¸ā§āϟāϞ⧇āĻļāύ">
+<!ENTITY  permGeo               "āĻļā§‡ā§ŸāĻžāϰ āĻ…āĻŦāĻ¸ā§āĻĨāĻžāύ">
 
-<!ENTITY permIndexedDB "āĻ…āĻĢāϞāĻžāχāύ āϏāĻ‚āϰāĻ•ā§āώāύ āĻŦā§āϝāĻŦāĻ¸ā§āĻĨāĻžāĻĒāύāĻž">
-<!ENTITY permClearStorage "āϏāĻ‚āϰāĻ•ā§āώāύ āĻ…āĻĒāϏāĻžāϰāύ">
-<!ENTITY permClearStorage.accesskey "C">
+<!ENTITY  permIndexedDB              "āĻ…āĻĢāϞāĻžāχāύ āϏāĻ‚āϰāĻ•ā§āώāύ āĻŦā§āϝāĻŦāĻ¸ā§āĻĨāĻžāĻĒāύāĻž">
+<!ENTITY  permClearStorage           "āϏāĻ‚āϰāĻ•ā§āώāύ āĻ…āĻĒāϏāĻžāϰāύ">
+<!ENTITY  permClearStorage.accesskey "C">
 
-<!ENTITY securityTab "āύāĻŋāϰāĻžāĻĒāĻ¤ā§āϤāĻž (S)">
-<!ENTITY securityTab.accesskey "S">
-<!ENTITY securityHeader "āĻāχ āĻĒ⧃āĻˇā§āĻ āĻžāϰ āύāĻŋāϰāĻžāĻĒāĻ¤ā§āϤāĻž āϏāĻ‚āĻ•ā§āϰāĻžāĻ¨ā§āϤ āϤāĻĨā§āϝ">
-<!ENTITY securityView.certView "āϏāĻžāĻ°ā§āϟāĻŋāĻĢāĻŋāϕ⧇āϟ āĻĒā§āϰāĻĻāĻ°ā§āĻļāύ ">
-<!ENTITY securityView.accesskey "V">
-<!ENTITY securityView.unknown "āĻ…āϜāĻžāύāĻž">
+<!ENTITY  securityTab           "āύāĻŋāϰāĻžāĻĒāĻ¤ā§āϤāĻž (S)">
+<!ENTITY  securityTab.accesskey "S">
+<!ENTITY  securityHeader        "āĻāχ āĻĒ⧃āĻˇā§āĻ āĻžāϰ āύāĻŋāϰāĻžāĻĒāĻ¤ā§āϤāĻž āϏāĻ‚āĻ•ā§āϰāĻžāĻ¨ā§āϤ āϤāĻĨā§āϝ">
+<!ENTITY  securityView.certView "āϏāĻžāĻ°ā§āϟāĻŋāĻĢāĻŋāϕ⧇āϟ āĻĒā§āϰāĻĻāĻ°ā§āĻļāύ ">
+<!ENTITY  securityView.accesskey "V">
+<!ENTITY  securityView.unknown   "āĻ…āϜāĻžāύāĻž">
 
 
-<!ENTITY securityView.identity.header "āĻ“ā§Ÿā§‡āĻŦāϏāĻžāχāĻŸā§‡āϰ āĻĒāϰāĻŋāϚ⧟">
-<!ENTITY securityView.identity.owner "āĻŽāĻžāϞāĻŋāĻ•āĻžāύāĻž: ">
-<!ENTITY securityView.identity.domain "āĻ“ā§Ÿā§‡āĻŦāϏāĻžāχāϟ: ">
-<!ENTITY securityView.identity.verifier "āϝāĻžāϚāĻžāχāĻ•āĻžāϰ⧀: ">
+<!ENTITY  securityView.identity.header   "āĻ“ā§Ÿā§‡āĻŦāϏāĻžāχāĻŸā§‡āϰ āĻĒāϰāĻŋāϚ⧟">
+<!ENTITY  securityView.identity.owner    "āĻŽāĻžāϞāĻŋāĻ•āĻžāύāĻž: ">
+<!ENTITY  securityView.identity.domain   "āĻ“ā§Ÿā§‡āĻŦāϏāĻžāχāϟ: ">
+<!ENTITY  securityView.identity.verifier "āϝāĻžāϚāĻžāχāĻ•āĻžāϰ⧀: ">
 
-<!ENTITY securityView.privacy.header "āĻ—ā§‹āĻĒāĻŖā§€ā§ŸāϤāĻž āĻ“ āχāϤāĻŋāĻšāĻžāϏ">
-<!ENTITY securityView.privacy.history "āφāϗ⧇ āϕ⧋āύ āϏāĻŽā§Ÿ āĻāχ āĻ“ā§Ÿā§‡āĻŦāϏāĻžāχāϟ āφāĻŽāĻŋ āĻĒāϰāĻŋāĻĻāĻ°ā§āĻļāύ āĻ•āϰ⧇āĻ›āĻŋ āĻ•āĻŋ?">
-<!ENTITY securityView.privacy.cookies "āĻāχ āĻ“ā§Ÿā§‡āĻŦāϏāĻžāχāϟ āĻ•āĻŋ āφāĻŽāĻžāϰ āĻ•āĻŽā§āĻĒāĻŋāωāϟāĻžāϰ⧇ āϤāĻĨā§āϝ (āϕ⧁āĻ•āĻŋ) āϏāĻ‚āϰāĻ•ā§āώāĻŖ āĻ•āϰāϛ⧇?">
-<!ENTITY securityView.privacy.viewCookies "āϕ⧁āĻ•āĻŋ āĻĒāϰāĻŋāĻĻāĻ°ā§āĻļāύ (K)">
-<!ENTITY securityView.privacy.viewCookies.accessKey "k">
-<!ENTITY securityView.privacy.passwords "āĻāχ āĻ“ā§Ÿā§‡āĻŦāϏāĻžāχāĻŸā§‡āϰ āϜāĻ¨ā§āϝ āĻ•āĻŋ āφāĻŽāĻŋ āϕ⧋āύ⧋ āĻĒāĻžāϏāĻ“ā§ŸāĻžāĻ°ā§āĻĄ āϏāĻ‚āϰāĻ•ā§āώāĻŖ āĻ•āϰ⧇āĻ›āĻŋ?">
-<!ENTITY securityView.privacy.viewPasswords "āϏāĻ‚āϰāĻ•ā§āώāĻŋāϤ āĻĒāĻžāϏāĻ“ā§ŸāĻžāĻ°ā§āĻĄ āĻĒāϰāĻŋāĻĻāĻ°ā§āĻļāύ (W)">
-<!ENTITY securityView.privacy.viewPasswords.accessKey "w">
+<!ENTITY  securityView.privacy.header                   "āĻ—ā§‹āĻĒāĻŖā§€ā§ŸāϤāĻž āĻ“ āχāϤāĻŋāĻšāĻžāϏ">
+<!ENTITY  securityView.privacy.history                  "āφāϗ⧇ āϕ⧋āύ āϏāĻŽā§Ÿ āĻāχ āĻ“ā§Ÿā§‡āĻŦāϏāĻžāχāϟ āφāĻŽāĻŋ āĻĒāϰāĻŋāĻĻāĻ°ā§āĻļāύ āĻ•āϰ⧇āĻ›āĻŋ āĻ•āĻŋ?">
+<!ENTITY  securityView.privacy.cookies                  "āĻāχ āĻ“ā§Ÿā§‡āĻŦāϏāĻžāχāϟ āĻ•āĻŋ āφāĻŽāĻžāϰ āĻ•āĻŽā§āĻĒāĻŋāωāϟāĻžāϰ⧇ āϤāĻĨā§āϝ (āϕ⧁āĻ•āĻŋ) āϏāĻ‚āϰāĻ•ā§āώāĻŖ āĻ•āϰāϛ⧇?">
+<!ENTITY  securityView.privacy.viewCookies              "āϕ⧁āĻ•āĻŋ āĻĒāϰāĻŋāĻĻāĻ°ā§āĻļāύ (K)">
+<!ENTITY  securityView.privacy.viewCookies.accessKey    "k">
+<!ENTITY  securityView.privacy.passwords                "āĻāχ āĻ“ā§Ÿā§‡āĻŦāϏāĻžāχāĻŸā§‡āϰ āϜāĻ¨ā§āϝ āĻ•āĻŋ āφāĻŽāĻŋ āϕ⧋āύ⧋ āĻĒāĻžāϏāĻ“ā§ŸāĻžāĻ°ā§āĻĄ āϏāĻ‚āϰāĻ•ā§āώāĻŖ āĻ•āϰ⧇āĻ›āĻŋ?">
+<!ENTITY  securityView.privacy.viewPasswords            "āϏāĻ‚āϰāĻ•ā§āώāĻŋāϤ āĻĒāĻžāϏāĻ“ā§ŸāĻžāĻ°ā§āĻĄ āĻĒāϰāĻŋāĻĻāĻ°ā§āĻļāύ (W)">
+<!ENTITY  securityView.privacy.viewPasswords.accessKey  "w">
 
-<!ENTITY securityView.technical.header "āĻĒā§āϰāϝ⧁āĻ•ā§āϤāĻŋāĻ—āϤ āĻŦāĻŋāĻŦāϰāĻŖ">
+<!ENTITY  securityView.technical.header                 "āĻĒā§āϰāϝ⧁āĻ•ā§āϤāĻŋāĻ—āϤ āĻŦāĻŋāĻŦāϰāĻŖ">
--- a/browser/chrome/browser/places/editBookmarkOverlay.dtd
+++ b/browser/chrome/browser/places/editBookmarkOverlay.dtd
@@ -1,25 +1,24 @@
-<!ENTITY editBookmarkOverlay.name.label "āύāĻžāĻŽ (N):">
-<!ENTITY editBookmarkOverlay.name.accesskey "N">
-<!ENTITY editBookmarkOverlay.location.label "āĻ…āĻŦāĻ¸ā§āĻĨāĻžāύ (L):">
-<!ENTITY editBookmarkOverlay.location.accesskey "L">
-<!ENTITY editBookmarkOverlay.feedLocation.label "āĻĢāĻŋāĻĄā§‡āϰ āĻ…āĻŦāĻ¸ā§āĻĨāĻžāύ: (F)">
-<!ENTITY editBookmarkOverlay.feedLocation.accesskey "F">
-<!ENTITY editBookmarkOverlay.siteLocation.label "āϏāĻžāχāĻŸā§‡āϰ āĻ…āĻŦāĻ¸ā§āĻĨāĻžāύ: (S)">
-<!ENTITY editBookmarkOverlay.siteLocation.accesskey "S">
-<!ENTITY editBookmarkOverlay.liveTitlesSeparator.label "āϞāĻžāχāĻ­ āĻļāĻŋāϰ⧋āύāĻžāĻŽ">
-<!ENTITY editBookmarkOverlay.folder.label "āĻĢā§‹āĻ˛ā§āĻĄāĻžāϰ:">
-<!ENTITY editBookmarkOverlay.foldersExpanderDown.tooltip "āϏāĻŦ āĻŦ⧁āĻ•āĻŽāĻžāĻ°ā§āĻ• āĻĢā§‹āĻ˛ā§āĻĄāĻžāϰ āĻĒā§āϰāĻĻāĻ°ā§āĻļāύ">
-<!ENTITY editBookmarkOverlay.expanderUp.tooltip "āĻ†ā§œāĻžāϞ">
-<!ENTITY editBookmarkOverlay.tags.label "āĻŸā§āϝāĻžāĻ—: (T)">
-<!ENTITY editBookmarkOverlay.tags.accesskey "T">
-<!ENTITY editBookmarkOverlay.tagsEmptyDesc.label "āĻ•āĻŽāĻž āϚāĻŋāĻšā§āύ āĻĻāĻŋā§Ÿā§‡ āĻŸā§āϝāĻžāĻ— āφāϞāĻžāĻĻāĻž āĻ•āϰāĻž āĻšāĻŦ⧇">
-<!ENTITY editBookmarkOverlay.description.label "āĻŦāĻŋāĻŦāϰāĻŖ: (D)">
-<!ENTITY editBookmarkOverlay.description.accesskey "D">
-<!ENTITY editBookmarkOverlay.keyword.label "āϕ⧀āĻ“ā§ŸāĻžāĻ°ā§āĻĄ: (K)">
-<!ENTITY editBookmarkOverlay.keyword.accesskey "K">
-<!ENTITY editBookmarkOverlay.tagsExpanderDown.tooltip "āϏāĻŦ āĻŸā§āϝāĻžāĻ— āĻĒā§āϰāĻĻāĻ°ā§āĻļāύ">
-<!ENTITY editBookmarkOverlay.loadInSidebar.label "āĻŦ⧁āĻ•āĻŽāĻžāĻ°ā§āĻ•āϟāĻŋ āϏāĻžāχāĻĄāĻŦāĻžāϰ⧇ āϞ⧋āĻĄ āĻ•āϰāĻž āĻšāĻŦ⧇ (H)">
-<!ENTITY editBookmarkOverlay.loadInSidebar.accesskey "H">
-<!ENTITY editBookmarkOverlay.choose.label "āύāĻŋāĻ°ā§āĻŦāĻžāϚāύâ€Ļ">
-<!ENTITY editBookmarkOverlay.newFolderButton.label "āύāϤ⧁āύ āĻĢā§‹āĻ˛ā§āĻĄāĻžāϰ (O)">
-<!ENTITY editBookmarkOverlay.newFolderButton.accesskey "O">
+<!ENTITY editBookmarkOverlay.name.label                      "āύāĻžāĻŽ (N):">
+<!ENTITY editBookmarkOverlay.name.accesskey                  "N">
+<!ENTITY editBookmarkOverlay.location.label                  "āĻ…āĻŦāĻ¸ā§āĻĨāĻžāύ (L):">
+<!ENTITY editBookmarkOverlay.location.accesskey              "L">
+<!ENTITY editBookmarkOverlay.feedLocation.label              "āĻĢāĻŋāĻĄā§‡āϰ āĻ…āĻŦāĻ¸ā§āĻĨāĻžāύ: (F)">
+<!ENTITY editBookmarkOverlay.feedLocation.accesskey          "F">
+<!ENTITY editBookmarkOverlay.siteLocation.label              "āϏāĻžāχāĻŸā§‡āϰ āĻ…āĻŦāĻ¸ā§āĻĨāĻžāύ: (S)">
+<!ENTITY editBookmarkOverlay.siteLocation.accesskey          "S">
+<!ENTITY editBookmarkOverlay.folder.label                    "āĻĢā§‹āĻ˛ā§āĻĄāĻžāϰ:">
+<!ENTITY editBookmarkOverlay.foldersExpanderDown.tooltip     "āϏāĻŦ āĻŦ⧁āĻ•āĻŽāĻžāĻ°ā§āĻ• āĻĢā§‹āĻ˛ā§āĻĄāĻžāϰ āĻĒā§āϰāĻĻāĻ°ā§āĻļāύ">
+<!ENTITY editBookmarkOverlay.expanderUp.tooltip              "āĻ†ā§œāĻžāϞ">
+<!ENTITY editBookmarkOverlay.tags.label                      "āĻŸā§āϝāĻžāĻ—: (T)">
+<!ENTITY editBookmarkOverlay.tags.accesskey                  "T">
+<!ENTITY editBookmarkOverlay.tagsEmptyDesc.label             "āĻ•āĻŽāĻž āϚāĻŋāĻšā§āύ āĻĻāĻŋā§Ÿā§‡ āĻŸā§āϝāĻžāĻ— āφāϞāĻžāĻĻāĻž āĻ•āϰāĻž āĻšāĻŦ⧇">
+<!ENTITY editBookmarkOverlay.description.label               "āĻŦāĻŋāĻŦāϰāĻŖ: (D)">
+<!ENTITY editBookmarkOverlay.description.accesskey           "D">
+<!ENTITY editBookmarkOverlay.keyword.label                   "āϕ⧀āĻ“ā§ŸāĻžāĻ°ā§āĻĄ: (K)">
+<!ENTITY editBookmarkOverlay.keyword.accesskey               "K">
+<!ENTITY editBookmarkOverlay.tagsExpanderDown.tooltip        "āϏāĻŦ āĻŸā§āϝāĻžāĻ— āĻĒā§āϰāĻĻāĻ°ā§āĻļāύ">
+<!ENTITY editBookmarkOverlay.loadInSidebar.label             "āĻŦ⧁āĻ•āĻŽāĻžāĻ°ā§āĻ•āϟāĻŋ āϏāĻžāχāĻĄāĻŦāĻžāϰ⧇ āϞ⧋āĻĄ āĻ•āϰāĻž āĻšāĻŦ⧇ (H)">
+<!ENTITY editBookmarkOverlay.loadInSidebar.accesskey         "H">
+<!ENTITY editBookmarkOverlay.choose.label                    "āύāĻŋāĻ°ā§āĻŦāĻžāϚāύâ€Ļ">
+<!ENTITY editBookmarkOverlay.newFolderButton.label           "āύāϤ⧁āύ āĻĢā§‹āĻ˛ā§āĻĄāĻžāϰ (O)">
+<!ENTITY editBookmarkOverlay.newFolderButton.accesskey       "O">
--- a/browser/chrome/browser/places/moveBookmarks.dtd
+++ b/browser/chrome/browser/places/moveBookmarks.dtd
@@ -1,5 +1,5 @@
-<!ENTITY window.title "āĻĢā§‹āĻ˛ā§āĻĄāĻžāϰ āύāĻŋāĻ°ā§āĻŦāĻžāϚāύ">
-<!ENTITY window.style "width: 36em; height: 18em;">
-<!ENTITY moveTo.label "āĻ¸ā§āĻĨāĻžāύāĻžāĻ¨ā§āϤāϰ āĻ•āϰāĻž āĻšāĻŦ⧇:">
-<!ENTITY newFolderButton.label "āύāϤ⧁āύ āĻĢā§‹āĻ˛ā§āĻĄāĻžāϰ (N)">
+<!ENTITY window.title              "āĻĢā§‹āĻ˛ā§āĻĄāĻžāϰ āύāĻŋāĻ°ā§āĻŦāĻžāϚāύ">
+<!ENTITY window.style              "width: 36em; height: 18em;">
+<!ENTITY moveTo.label              "āĻ¸ā§āĻĨāĻžāύāĻžāĻ¨ā§āϤāϰ āĻ•āϰāĻž āĻšāĻŦ⧇:">
+<!ENTITY newFolderButton.label     "āύāϤ⧁āύ āĻĢā§‹āĻ˛ā§āĻĄāĻžāϰ (N)">
 <!ENTITY newFolderButton.accesskey "N">
--- a/browser/chrome/browser/places/places.dtd
+++ b/browser/chrome/browser/places/places.dtd
@@ -1,142 +1,134 @@
 <!-- LOCALIZATION NOTE (places.library.title): use "Library", "Archive" or "Repository" -->
-<!ENTITY places.library.title "āϞāĻžāχāĻŦā§āϰ⧇āϰāĻŋ">
-<!ENTITY places.library.width "700">
+<!ENTITY places.library.title  "āϞāĻžāχāĻŦā§āϰ⧇āϰāĻŋ">
+<!ENTITY places.library.width  "700">
 <!ENTITY places.library.height "500">
-<!ENTITY organize.label "āϏāĻ‚āĻ—āĻ āĻŋāϤāĻ•āϰāĻŖ (O)">
-<!ENTITY organize.accesskey "O">
-<!ENTITY organize.tooltip "Organize your bookmarks">
+<!ENTITY organize.label        "āϏāĻ‚āĻ—āĻ āĻŋāϤāĻ•āϰāĻŖ (O)">
+<!ENTITY organize.accesskey    "O">
+<!ENTITY organize.tooltip      "Organize your bookmarks">
 
-<!ENTITY file.accesskey "F">
-<!ENTITY file.close.label "āĻŦāĻ¨ā§āϧ (C)">
-<!ENTITY file.close.accesskey "C">
-<!ENTITY cmd.close.key "w">
-<!ENTITY edit.label "āϏāĻŽā§āĻĒāĻžāĻĻāύāĻž (E)">
-<!ENTITY edit.accesskey "E">
-<!ENTITY views.label "āĻĒā§āϰāĻĻāĻ°ā§āĻļāύ (V)">
-<!ENTITY views.accesskey "V">
-<!ENTITY views.tooltip "Change your view">
-<!ENTITY view.columns.label "āĻ•āϞāĻžāĻŽ āĻĒā§āϰāĻĻāĻ°ā§āĻļāύ āĻ•āϰāĻž āĻšāĻŦ⧇ (C)">
-<!ENTITY view.columns.accesskey "C">
-<!ENTITY view.sort.label "āϏāĻžāϜāĻžāύ⧋ (S)">
-<!ENTITY view.sort.accesskey "S">
-<!ENTITY view.unsorted.label "āĻ…āĻŦāĻŋāĻ¨ā§āϝāĻ¸ā§āϤ (U)">
-<!ENTITY view.unsorted.accesskey "U">
-<!ENTITY view.sortAscending.label "A > Z āĻ•ā§āϰāĻŽā§‡ (A)">
-<!ENTITY view.sortAscending.accesskey "A">
-<!ENTITY view.sortDescending.label "Z > A āĻ•ā§āϰāĻŽā§‡ (Z)">
-<!ENTITY view.sortDescending.accesskey "Z">
+<!ENTITY file.close.label               "āĻŦāĻ¨ā§āϧ (C)">
+<!ENTITY file.close.accesskey           "C">
+<!ENTITY cmd.close.key                  "w">
+<!ENTITY views.label                    "āĻĒā§āϰāĻĻāĻ°ā§āĻļāύ (V)">
+<!ENTITY views.accesskey                "V">
+<!ENTITY views.tooltip                  "Change your view">
+<!ENTITY view.columns.label             "āĻ•āϞāĻžāĻŽ āĻĒā§āϰāĻĻāĻ°ā§āĻļāύ āĻ•āϰāĻž āĻšāĻŦ⧇ (C)">
+<!ENTITY view.columns.accesskey         "C">
+<!ENTITY view.sort.label                "āϏāĻžāϜāĻžāύ⧋ (S)">
+<!ENTITY view.sort.accesskey            "S">
+<!ENTITY view.unsorted.label            "āĻ…āĻŦāĻŋāĻ¨ā§āϝāĻ¸ā§āϤ (U)">
+<!ENTITY view.unsorted.accesskey        "U">
+<!ENTITY view.sortAscending.label       "A > Z āĻ•ā§āϰāĻŽā§‡ (A)">
+<!ENTITY view.sortAscending.accesskey   "A">
+<!ENTITY view.sortDescending.label      "Z > A āĻ•ā§āϰāĻŽā§‡ (Z)">
+<!ENTITY view.sortDescending.accesskey  "Z">
 
-<!ENTITY cmd.findInBookmarks.label "āĻŦ⧁āĻ•āĻŽāĻžāĻ°ā§āϕ⧇ āĻ…āύ⧁āϏāĻ¨ā§āϧāĻžāύâ€Ļ (F)">
-<!ENTITY cmd.findInBookmarks.accesskey "F">
-<!ENTITY cmd.findCurrent.label "āĻŦāĻ°ā§āϤāĻŽāĻžāύ āϏāĻ‚āĻ•āϞāύ⧇ āĻ…āύ⧁āϏāĻ¨ā§āϧāĻžāύâ€Ļ (I)">
-<!ENTITY cmd.findCurrent.accesskey "I">
+<!ENTITY cmd.findInBookmarks.label      "āĻŦ⧁āĻ•āĻŽāĻžāĻ°ā§āϕ⧇ āĻ…āύ⧁āϏāĻ¨ā§āϧāĻžāύâ€Ļ (F)">
+<!ENTITY cmd.findInBookmarks.accesskey  "F">
+<!ENTITY cmd.findCurrent.label          "āĻŦāĻ°ā§āϤāĻŽāĻžāύ āϏāĻ‚āĻ•āϞāύ⧇ āĻ…āύ⧁āϏāĻ¨ā§āϧāĻžāύâ€Ļ (I)">
+<!ENTITY cmd.findCurrent.accesskey      "I">
 
-<!ENTITY cmd.exportHTML.label "HTML āĻāĻ•ā§āϏāĻĒā§‹āĻ°ā§āϟâ€Ļ (E)">
-<!ENTITY cmd.exportHTML.accesskey "E">
-<!ENTITY cmd.importHTML.label "HTML āχāĻŽāĻĒā§‹āĻ°ā§āϟâ€Ļ (I)">
-<!ENTITY cmd.importHTML.accesskey "I">
+<!ENTITY cmd.exportHTML.label           "HTML āĻāĻ•ā§āϏāĻĒā§‹āĻ°ā§āϟâ€Ļ (E)">
+<!ENTITY cmd.exportHTML.accesskey       "E">
+<!ENTITY cmd.importHTML.label           "HTML āχāĻŽāĻĒā§‹āĻ°ā§āϟâ€Ļ (I)">
+<!ENTITY cmd.importHTML.accesskey       "I">
 
-<!ENTITY cmd.backup.label "āĻŦā§āϝāĻžāĻ•āφāĻĒâ€Ļ (B)">
-<!ENTITY cmd.backup.accesskey "B">
-<!ENTITY cmd.restore2.label "āĻĒ⧁āύāϰ⧁āĻĻā§āϧāĻžāϰ (R)">
-<!ENTITY cmd.restore2.accesskey "R">
-<!ENTITY cmd.restoreFromFile.label "āĻĢāĻžāχāϞ āύāĻŋāĻ°ā§āĻŦāĻžāϚāύâ€Ļ (C)">
-<!ENTITY cmd.restoreFromFile.accesskey "C">
+<!ENTITY cmd.backup.label               "āĻŦā§āϝāĻžāĻ•āφāĻĒâ€Ļ (B)">
+<!ENTITY cmd.backup.accesskey           "B">
+<!ENTITY cmd.restore2.label             "āĻĒ⧁āύāϰ⧁āĻĻā§āϧāĻžāϰ (R)">
+<!ENTITY cmd.restore2.accesskey         "R">
+<!ENTITY cmd.restoreFromFile.label      "āĻĢāĻžāχāϞ āύāĻŋāĻ°ā§āĻŦāĻžāϚāύâ€Ļ (C)">
+<!ENTITY cmd.restoreFromFile.accesskey  "C">
 
-<!ENTITY cmd.bookmarkLink.label "āĻāχ āĻĒ⧃āĻˇā§āĻ āĻžāϟāĻŋ āĻŦ⧁āĻ•āĻŽāĻžāĻ°ā§āĻ• āĻ•āϰ⧁āύâ€Ļ (B)">
-<!ENTITY cmd.bookmarkLink.accesskey "B">
-<!ENTITY cmd.delete.label "āĻāχ āĻĒ⧃āĻˇā§āĻ āĻžāϟāĻŋ āĻŽā§āϛ⧇ āĻĢ⧇āϞ⧁āύ (D)">
-<!ENTITY cmd.delete.accesskey "D">
-<!ENTITY cmd.deleteDomainData.label "āĻāχ āϏāĻžāχāϟāϟāĻŋ āĻŽāύ⧇ āϰāĻžāĻ–āĻž āĻšāĻŦ⧇ āύāĻž (F)">
+<!ENTITY cmd.bookmarkLink.label         "āĻāχ āĻĒ⧃āĻˇā§āĻ āĻžāϟāĻŋ āĻŦ⧁āĻ•āĻŽāĻžāĻ°ā§āĻ• āĻ•āϰ⧁āύâ€Ļ (B)">
+<!ENTITY cmd.bookmarkLink.accesskey     "B">
+<!ENTITY cmd.delete.label               "āĻāχ āĻĒ⧃āĻˇā§āĻ āĻžāϟāĻŋ āĻŽā§āϛ⧇ āĻĢ⧇āϞ⧁āύ (D)">
+<!ENTITY cmd.delete.accesskey           "D">
+<!ENTITY cmd.deleteDomainData.label     "āĻāχ āϏāĻžāχāϟāϟāĻŋ āĻŽāύ⧇ āϰāĻžāĻ–āĻž āĻšāĻŦ⧇ āύāĻž (F)">
 <!ENTITY cmd.deleteDomainData.accesskey "F">
 
-<!ENTITY cmd.open.label "āϖ⧁āϞ⧁āύ (O)">
-<!ENTITY cmd.open.accesskey "O">
-<!ENTITY cmd.open_window.label "āύāϤ⧁āύ āωāχāĻ¨ā§āĻĄā§‹āϤ⧇ āϖ⧁āϞ⧁āύ (N)">
-<!ENTITY cmd.open_window.accesskey "N">
-<!ENTITY cmd.open_tab.label "āύāϤ⧁āύ āĻŸā§āϝāĻžāĻŦ⧇ āϖ⧁āϞ⧁āύ (W)">
-<!ENTITY cmd.open_tab.accesskey "W">
-<!ENTITY cmd.open_all_in_tabs.label "āĻŸā§āϝāĻžāĻŦ⧇ āϏāĻŦ āϖ⧁āϞ⧁āύ (O)">
-<!ENTITY cmd.open_all_in_tabs.accesskey "O">
+<!ENTITY cmd.open.label                  "āϖ⧁āϞ⧁āύ (O)">
+<!ENTITY cmd.open.accesskey              "O">
+<!ENTITY cmd.open_window.label           "āύāϤ⧁āύ āωāχāĻ¨ā§āĻĄā§‹āϤ⧇ āϖ⧁āϞ⧁āύ (N)">
+<!ENTITY cmd.open_window.accesskey       "N">
+<!ENTITY cmd.open_tab.label              "āύāϤ⧁āύ āĻŸā§āϝāĻžāĻŦ⧇ āϖ⧁āϞ⧁āύ (W)">
+<!ENTITY cmd.open_tab.accesskey          "W">
+<!ENTITY cmd.open_all_in_tabs.label      "āĻŸā§āϝāĻžāĻŦ⧇ āϏāĻŦ āϖ⧁āϞ⧁āύ (O)">
+<!ENTITY cmd.open_all_in_tabs.accesskey  "O">
 
-<!ENTITY cmd.properties.label "āĻŦ⧈āĻļāĻŋāĻˇā§āĻŸā§āϝāĻžāĻŦāϞ⧀ (I)">
-<!ENTITY cmd.properties.accesskey "I">
-
-<!ENTITY cmd.sortby_name.label "āύāĻžāĻŽ āĻ…āύ⧁āϏāĻžāϰ⧇ āϏāĻžāϜāĻžāύ (S)">
-<!ENTITY cmd.sortby_name.accesskey "S">
-<!ENTITY cmd.context_sortby_name.accesskey "r">
+<!ENTITY cmd.properties.label      "āĻŦ⧈āĻļāĻŋāĻˇā§āĻŸā§āϝāĻžāĻŦāϞ⧀ (I)">
+<!ENTITY cmd.properties.accesskey  "I">
 
-<!ENTITY cmd.new_bookmark.label "āύāϤ⧁āύ āĻŦ⧁āĻ•āĻŽāĻžāĻ°ā§āĻ•â€Ļ (B)">
-<!ENTITY cmd.new_bookmark.accesskey "B">
-<!ENTITY cmd.new_folder.label "āύāϤ⧁āύ āĻĢā§‹āĻ˛ā§āĻĄāĻžāϰâ€Ļ (O)">
-<!ENTITY cmd.new_folder.accesskey "O">
-<!ENTITY cmd.context_new_folder.accesskey "F">
-<!ENTITY cmd.new_separator.label "āύāϤ⧁āύ āĻŦāĻŋāĻ­āĻžāϜāĻ• (S)">
-<!ENTITY cmd.new_separator.accesskey "S">
+<!ENTITY cmd.sortby_name.label              "āύāĻžāĻŽ āĻ…āύ⧁āϏāĻžāϰ⧇ āϏāĻžāϜāĻžāύ (S)">
+<!ENTITY cmd.sortby_name.accesskey          "S">
+<!ENTITY cmd.context_sortby_name.accesskey  "r">
 
-<!ENTITY cmd.reloadLivebookmark.label "āϞāĻžāχāĻ­ āĻŦ⧁āĻ•āĻŽāĻžāĻ°ā§āĻ• āϰāĻŋāϞ⧋āĻĄ āĻ•āϰāĻž āĻšāĻŦ⧇ (R)">
-<!ENTITY cmd.reloadLivebookmark.accesskey "R">
-<!ENTITY cmd.reloadMicrosummary.label "āϞāĻžāχāĻ­ āĻļāĻŋāϰ⧋āύāĻžāĻŽ āϰāĻŋāϞ⧋āĻĄ āĻ•āϰāĻž āĻšāĻŦ⧇ (R)">
-<!ENTITY cmd.reloadMicrosummary.accesskey "R">
+<!ENTITY cmd.new_bookmark.label            "āύāϤ⧁āύ āĻŦ⧁āĻ•āĻŽāĻžāĻ°ā§āĻ•â€Ļ (B)">
+<!ENTITY cmd.new_bookmark.accesskey        "B">
+<!ENTITY cmd.new_folder.label              "āύāϤ⧁āύ āĻĢā§‹āĻ˛ā§āĻĄāĻžāϰâ€Ļ (O)">
+<!ENTITY cmd.new_folder.accesskey          "O">
+<!ENTITY cmd.context_new_folder.accesskey  "F">
+<!ENTITY cmd.new_separator.label           "āύāϤ⧁āύ āĻŦāĻŋāĻ­āĻžāϜāĻ• (S)">
+<!ENTITY cmd.new_separator.accesskey       "S">
 
-<!ENTITY cmd.moveBookmarks.label "āĻ¸ā§āĻĨāĻžāύāĻžāĻ¨ā§āϤāϰâ€Ļ (M)">
-<!ENTITY cmd.moveBookmarks.accesskey "M">
+<!ENTITY cmd.reloadLivebookmark.label      "āϞāĻžāχāĻ­ āĻŦ⧁āĻ•āĻŽāĻžāĻ°ā§āĻ• āϰāĻŋāϞ⧋āĻĄ āĻ•āϰāĻž āĻšāĻŦ⧇ (R)">
+<!ENTITY cmd.reloadLivebookmark.accesskey  "R">
+
+<!ENTITY cmd.moveBookmarks.label                  "āĻ¸ā§āĻĨāĻžāύāĻžāĻ¨ā§āϤāϰâ€Ļ (M)">
+<!ENTITY cmd.moveBookmarks.accesskey              "M">
 
-<!ENTITY col.name.label "āύāĻžāĻŽ">
-<!ENTITY col.tags.label "āĻŸā§āϝāĻžāĻ—">
-<!ENTITY col.url.label "āĻ…āĻŦāĻ¸ā§āĻĨāĻžāύ">
-<!ENTITY col.lastvisit.label "āĻĒāϰāĻŋāĻĻāĻ°ā§āĻļāύ⧇āϰ āϤāĻžāϰāĻŋāĻ–">
-<!ENTITY col.visitcount.label "āĻĒāϰāĻŋāĻĻāĻ°ā§āĻļāύ⧇āϰ āϏāĻ‚āĻ–ā§āϝāĻž">
-<!ENTITY col.keyword.label "āϕ⧀āĻ“ā§ŸāĻžāĻ°ā§āĻĄ">
-<!ENTITY col.description.label "āĻŦāĻ°ā§āĻŖāύāĻž">
-<!ENTITY col.dateadded.label "āϝ⧋āĻ— āĻšā§Ÿā§‡āϛ⧇">
-<!ENTITY col.lastmodified.label "āϏāĻ°ā§āĻŦāĻļ⧇āώ āĻĒāϰāĻŋāĻŦāĻ°ā§āϤāύ">
+<!ENTITY col.name.label          "āύāĻžāĻŽ">
+<!ENTITY col.tags.label          "āĻŸā§āϝāĻžāĻ—">
+<!ENTITY col.url.label           "āĻ…āĻŦāĻ¸ā§āĻĨāĻžāύ">
+<!ENTITY col.lastvisit.label     "āĻĒāϰāĻŋāĻĻāĻ°ā§āĻļāύ⧇āϰ āϤāĻžāϰāĻŋāĻ–">
+<!ENTITY col.visitcount.label    "āĻĒāϰāĻŋāĻĻāĻ°ā§āĻļāύ⧇āϰ āϏāĻ‚āĻ–ā§āϝāĻž">
+<!ENTITY col.keyword.label       "āϕ⧀āĻ“ā§ŸāĻžāĻ°ā§āĻĄ">
+<!ENTITY col.description.label   "āĻŦāĻ°ā§āĻŖāύāĻž">
+<!ENTITY col.dateadded.label     "āϝ⧋āĻ— āĻšā§Ÿā§‡āϛ⧇">
+<!ENTITY col.lastmodified.label  "āϏāĻ°ā§āĻŦāĻļ⧇āώ āĻĒāϰāĻŋāĻŦāĻ°ā§āϤāύ">
 
-<!ENTITY search.label "āĻ…āύ⧁āϏāĻ¨ā§āϧāĻžāύ (S):">
-<!ENTITY search.accesskey "S">
+<!ENTITY search.label                              "āĻ…āύ⧁āϏāĻ¨ā§āϧāĻžāύ (S):">
+<!ENTITY search.accesskey                          "S">
 
-<!ENTITY search.in.label "āĻ…āύ⧁āϏāĻ¨ā§āϧāĻžāύ:">
-<!ENTITY search.scopeFolder.label "āύāĻŋāĻ°ā§āĻŦāĻžāϚāĻŋāϤ āĻĢā§‹āĻ˛ā§āĻĄāĻžāϰ (F)">
-<!ENTITY search.scopeFolder.accesskey "F">
-<!ENTITY search.scopeBookmarks.label "āĻŦ⧁āĻ•āĻŽāĻžāĻ°ā§āĻ• (K)">
-<!ENTITY search.scopeBookmarks.accesskey "K">
-<!ENTITY search.scopeDownloads.label "āĻĄāĻžāωāύāϞ⧋āĻĄ (D)">
-<!ENTITY search.scopeDownloads.accesskey "D">
-<!ENTITY search.scopeHistory.label "āχāϤāĻŋāĻšāĻžāϏ (H)">
-<!ENTITY search.scopeHistory.accesskey "H">
-<!ENTITY saveSearch.label "āϏāĻ‚āϰāĻ•ā§āώāĻŖ (S)">
-<!ENTITY saveSearch.accesskey "S">
+<!ENTITY search.in.label                           "āĻ…āύ⧁āϏāĻ¨ā§āϧāĻžāύ:">
+<!ENTITY search.scopeFolder.label                  "āύāĻŋāĻ°ā§āĻŦāĻžāϚāĻŋāϤ āĻĢā§‹āĻ˛ā§āĻĄāĻžāϰ (F)">
+<!ENTITY search.scopeFolder.accesskey              "F">
+<!ENTITY search.scopeBookmarks.label               "āĻŦ⧁āĻ•āĻŽāĻžāĻ°ā§āĻ• (K)">
+<!ENTITY search.scopeBookmarks.accesskey           "K">
+<!ENTITY search.scopeDownloads.label               "āĻĄāĻžāωāύāϞ⧋āĻĄ (D)">
+<!ENTITY search.scopeDownloads.accesskey           "D">
+<!ENTITY search.scopeHistory.label                 "āχāϤāĻŋāĻšāĻžāϏ (H)">
+<!ENTITY search.scopeHistory.accesskey             "H">
+<!ENTITY saveSearch.label                          "āϏāĻ‚āϰāĻ•ā§āώāĻŖ (S)">
+<!ENTITY saveSearch.accesskey                      "S">
 
-<!ENTITY cmd.find.key "f">
-
-<!ENTITY maintenance.label "āχāĻŽāĻĒā§‹āĻ°ā§āϟ āĻ“ āĻŦā§āϝāĻžāĻ•-āφāĻĒ (I)">
-<!ENTITY maintenance.accesskey "I">
-<!ENTITY maintenance.tooltip "āφāĻĒāύāĻžāϰ āĻŦ⧁āĻ•āĻŽāĻžāĻ°ā§āĻ• āχāĻŽā§āĻĒā§‹āĻ°ā§āϟ āĻāĻŦāĻ‚ āĻŦā§āϝāĻžāĻ•āφāĻĒ">
+<!ENTITY cmd.find.key  "f">
 
-<!ENTITY backCmd.label "āĻĒā§‚āĻ°ā§āĻŦāĻŦāĻ°ā§āϤ⧀">
-<!ENTITY backButton.tooltip "āĻĒā§‚āĻ°ā§āĻŦāĻŦāĻ°ā§āϤ⧀ āĻ¸ā§āĻĨāĻžāύ⧇ āĻĢāĻŋāϰ⧇ āϝāĻžāĻŦ⧇">
+<!ENTITY maintenance.label      "āχāĻŽāĻĒā§‹āĻ°ā§āϟ āĻ“ āĻŦā§āϝāĻžāĻ•-āφāĻĒ (I)">
+<!ENTITY maintenance.accesskey  "I">
+<!ENTITY maintenance.tooltip    "āφāĻĒāύāĻžāϰ āĻŦ⧁āĻ•āĻŽāĻžāĻ°ā§āĻ• āχāĻŽā§āĻĒā§‹āĻ°ā§āϟ āĻāĻŦāĻ‚ āĻŦā§āϝāĻžāĻ•āφāĻĒ">
 
-<!ENTITY forwardCmd.label "āĻĒāϰāĻŦāĻ°ā§āϤ⧀">
-<!ENTITY forwardButton.tooltip "āĻĒāϰāĻŦāĻ°ā§āϤ⧀ āĻ¸ā§āĻĨāĻžāύ⧇ āĻāĻ—āĻŋā§Ÿā§‡ āϝāĻžāĻŦ⧇">
+<!ENTITY backButton.tooltip  "āĻĒā§‚āĻ°ā§āĻŦāĻŦāĻ°ā§āϤ⧀ āĻ¸ā§āĻĨāĻžāύ⧇ āĻĢāĻŋāϰ⧇ āϝāĻžāĻŦ⧇">
+
+<!ENTITY forwardButton.tooltip  "āĻĒāϰāĻŦāĻ°ā§āϤ⧀ āĻ¸ā§āĻĨāĻžāύ⧇ āĻāĻ—āĻŋā§Ÿā§‡ āϝāĻžāĻŦ⧇">
 
 <!ENTITY detailsPane.more.label "āφāϰāĻ“ (e)">
 <!ENTITY detailsPane.more.accesskey "e">
 <!ENTITY detailsPane.less.label "āĻ•āĻŽ (e)">
 <!ENTITY detailsPane.less.accesskey "e">
-<!ENTITY detailsPane.noPreviewAvailable.label "āĻĒā§āϰāĻžāĻ•āĻĻāĻ°ā§āĻļāύ">
 <!ENTITY detailsPane.selectAnItemText.description "āĻāĻ•āϟāĻŋ āφāχāĻŸā§‡āĻŽ āύāĻŋāĻ°ā§āĻŦāĻžāϚāύ āĻ•āϰ⧇ āϤāĻžāϰ āĻŦ⧈āĻļāĻŋāĻˇā§āĻŸā§āϝ āĻĒā§āϰāĻĻāĻ°ā§āĻļāύ āĻ“ āĻĒāϰāĻŋāĻŦāĻ°ā§āϤāύ">
 
-<!ENTITY find.label "āĻ…āύ⧁āϏāĻ¨ā§āϧāĻžāύ: (S)">
-<!ENTITY find.accesskey "S">
-<!ENTITY view.label "āĻĒā§āϰāĻĻāĻ°ā§āĻļāύ (w)">
-<!ENTITY view.accesskey "w">
-<!ENTITY byDate.label "āϤāĻžāϰāĻŋāĻ– āĻ…āύ⧁āϏāĻžāϰ⧇ (D)">
-<!ENTITY byDate.accesskey "D">
-<!ENTITY bySite.label "āϏāĻžāχāϟ āĻ…āύ⧁āϏāĻžāϰ⧇ (S)">
-<!ENTITY bySite.accesskey "S">
-<!ENTITY byMostVisited.label "āϏāĻ°ā§āĻŦāĻžāϧāĻŋāĻ• āĻĒā§āϰāĻĻāĻ°ā§āĻļāĻŋāϤ (V)">
-<!ENTITY byMostVisited.accesskey "V">
-<!ENTITY byLastVisited.label "āĻļ⧇āώāĻŦāĻžāϰ āĻĒā§āϰāĻĻāĻ°ā§āĻļāĻŋāϤ (L)">
-<!ENTITY byLastVisited.accesskey "L">
-<!ENTITY byDayAndSite.label "āϤāĻžāϰāĻŋāĻ– āĻ“ āϏāĻžāχāϟ āĻ…āύ⧁āϏāĻžāϰ⧇ (t)">
-<!ENTITY byDayAndSite.accesskey "t">
+<!ENTITY find.label               "āĻ…āύ⧁āϏāĻ¨ā§āϧāĻžāύ: (S)">
+<!ENTITY find.accesskey           "S">
+<!ENTITY view.label               "āĻĒā§āϰāĻĻāĻ°ā§āĻļāύ (w)">
+<!ENTITY view.accesskey           "w">
+<!ENTITY byDate.label             "āϤāĻžāϰāĻŋāĻ– āĻ…āύ⧁āϏāĻžāϰ⧇ (D)">
+<!ENTITY byDate.accesskey         "D">
+<!ENTITY bySite.label             "āϏāĻžāχāϟ āĻ…āύ⧁āϏāĻžāϰ⧇ (S)">
+<!ENTITY bySite.accesskey         "S">
+<!ENTITY byMostVisited.label      "āϏāĻ°ā§āĻŦāĻžāϧāĻŋāĻ• āĻĒā§āϰāĻĻāĻ°ā§āĻļāĻŋāϤ (V)">
+<!ENTITY byMostVisited.accesskey  "V">
+<!ENTITY byLastVisited.label      "āĻļ⧇āώāĻŦāĻžāϰ āĻĒā§āϰāĻĻāĻ°ā§āĻļāĻŋāϤ (L)">
+<!ENTITY byLastVisited.accesskey  "L">
+<!ENTITY byDayAndSite.label       "āϤāĻžāϰāĻŋāĻ– āĻ“ āϏāĻžāχāϟ āĻ…āύ⧁āϏāĻžāϰ⧇ (t)">
+<!ENTITY byDayAndSite.accesskey   "t">
--- a/browser/chrome/browser/places/places.properties
+++ b/browser/chrome/browser/places/places.properties
@@ -1,11 +1,8 @@
-deleteHost=%S āĻĨ⧇āϕ⧇ āϏāĻŦ āĻŽā§āϛ⧇ āĻĢ⧇āϞāĻž āĻšāĻŦ⧇
-deleteDomain=āϏāĻŽā§āĻĒā§‚āĻ°ā§āĻŖ āĻĄā§‹āĻŽā§‡āχāύ %S āĻŽā§āϛ⧇ āĻĢ⧇āϞāĻž āĻšāĻŦ⧇
-
 load-js-data-url-error=āύāĻŋāϰāĻžāĻĒāĻ¤ā§āϤāĻžāϜāύāĻŋāϤ āĻ•āĻžāϰāϪ⧇, āχāϤāĻŋāĻšāĻžāϏ āωāχāĻ¨ā§āĻĄā§‹ āĻ…āĻĨāĻŦāĻž āϏāĻžāχāĻĄāĻŦāĻžāϰ āĻĨ⧇āϕ⧇ javascript āĻ…āĻĨāĻŦāĻž āĻĄāĻžāϟāĻž url āϞ⧋āĻĄ āĻ•āϰāĻž āϏāĻŽā§āĻ­āĻŦ āύ⧟āĨ¤
 noTitle=(āĻļāĻŋāϰ⧋āύāĻžāĻŽāĻšā§€āύ)
 
 bookmarksMenuEmptyFolder=(āĻĢāĻžāρāĻ•āĻž)
 
 bookmarksBackupTitle=āĻŦ⧁āĻ•āĻŽāĻžāĻ°ā§āĻ• āĻŦā§āϝāĻžāĻ•āφāĻĒ āĻĢāĻžāχāϞ⧇āϰ āύāĻžāĻŽ
 
 bookmarksRestoreAlertTitle=āĻŦ⧁āĻ•āĻŽāĻžāĻ°ā§āĻ• āĻĒā§‚āĻ°ā§āĻŦāĻžāĻŦāĻ¸ā§āĻĨāĻžā§Ÿ āĻĢāĻŋāϰāĻžāύ⧋
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/preferences/aboutPermissions.dtd
@@ -0,0 +1,35 @@
+<!ENTITY permissionsManager.title        "Permissions Manager">
+
+<!ENTITY sites.search                    "Search Sites">
+<!ENTITY sites.allSites                  "All Sites">
+
+<!-- LOCALIZATION NOTE (permissions.header.start, permissions.header.end): These strings
+     surround the host name of the site to make the header for the permissions page.
+     example: "Permissions for mozilla.org" -->
+<!ENTITY header.site.start               "Permissions for">
+<!ENTITY header.site.end                 "">
+
+<!ENTITY header.defaults                 "Default Permissions for All Sites">
+
+<!ENTITY permissions.forgetSite          "Forget About This Site">
+
+<!ENTITY permission.alwaysAsk            "Always Ask">
+<!ENTITY permission.allow                "Allow">
+<!ENTITY permission.allowForSession      "Allow for Session">
+<!ENTITY permission.block                "Block">
+
+<!ENTITY password.label                  "Store Passwords">
+<!ENTITY password.manage                 "Manage Passwordsâ€Ļ">
+
+<!ENTITY cookie.label                    "Set Cookies">
+<!ENTITY cookie.clear                    "Clear Cookies">
+<!ENTITY cookie.manage                   "Manage Cookiesâ€Ļ">
+<!ENTITY cookie.clearAll                 "Clear All Cookies">
+
+<!ENTITY geo.label                       "Share Location">
+
+<!-- LOCALIZATION NOTE (indexedDB.label): This is describing indexedDB storage
+     using the same language used for the permIndexedDB string in browser/pageInfo.dtd -->
+<!ENTITY indexedDB.label                 "Maintain Offline Storage">
+
+<!ENTITY popup.label                     "Open Pop-up Windows">
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/preferences/aboutPermissions.properties
@@ -0,0 +1,5 @@
+# LOCALIZATION NOTE (visitCount): #1 is the number of history visits for a site
+visitCount=#1 visit;#1 visits
+
+passwordsCount=#1 password is stored for this web site.;#1 passwords are stored for this web site.
+cookiesCount=#1 cookie is set for this web site.;#1 cookies are set for this web site.
--- a/browser/chrome/browser/preferences/advanced-scripts.dtd
+++ b/browser/chrome/browser/preferences/advanced-scripts.dtd
@@ -30,19 +30,19 @@
    - decision by deleting the provisions above and replace them with the notice
    - and other provisions required by the LGPL or the GPL. If you do not delete
    - the provisions above, a recipient may use your version of this file under
    - the terms of any one of the MPL, the GPL or the LGPL.
    -
 #endif
    - ***** END LICENSE BLOCK ***** -->
 
-<!ENTITY advancedJSDialog.title "JavaScript-āĻāϰ āωāĻšā§āϚāĻĒāĻ°ā§āϝāĻžā§Ÿā§‡āϰ āϏ⧇āϟāĻŋāĻ‚">
-<!ENTITY window.width "37em">
+<!ENTITY advancedJSDialog.title         "JavaScript-āĻāϰ āωāĻšā§āϚāĻĒāĻ°ā§āϝāĻžā§Ÿā§‡āϰ āϏ⧇āϟāĻŋāĻ‚">
+<!ENTITY window.width                   "37em">
 
-<!ENTITY allowScripts.label "āĻ¸ā§āĻ•ā§āϰāĻŋāĻĒā§āϟ āϝāĻž āϝāĻž āĻ•āϰāϤ⧇ āĻ…āύ⧁āĻŽā§‹āĻĻāĻŋāϤ:">
+<!ENTITY allowScripts.label             "āĻ¸ā§āĻ•ā§āϰāĻŋāĻĒā§āϟ āϝāĻž āϝāĻž āĻ•āϰāϤ⧇ āĻ…āύ⧁āĻŽā§‹āĻĻāĻŋāϤ:">
 
-<!ENTITY moveResizeWindows.label "āωāχāĻ¨ā§āĻĄā§‹ āϏāϰāĻžāύ⧋ āĻ…āĻĨāĻŦāĻž āφāĻ•āĻžāϰ āĻĒāϰāĻŋāĻŦāĻ°ā§āϤāύ (M)">
-<!ENTITY moveResizeWindows.accesskey "M">
-<!ENTITY raiseLowerWindows.label "āωāχāĻ¨ā§āĻĄā§‹ āωāĻĒāϰ⧇ āϤ⧋āϞāĻž āĻŦāĻž āύ⧀āĻšā§‡ āύāĻžāĻŽāĻžāύ⧋ (R)">
-<!ENTITY raiseLowerWindows.accesskey "R">
-<!ENTITY disableContextMenus.label "āĻĒā§āϰāĻžāϏāĻ™ā§āĻ—āĻŋāĻ•-āĻŽā§‡āύ⧁ āύāĻŋāĻˇā§āĻ•ā§āϰāĻŋ⧟ āĻ…āĻĨāĻŦāĻž āĻĒā§āϰāϤāĻŋāĻ¸ā§āĻĨāĻžāĻĒāύ āĻ•āϰāĻž (D)">
-<!ENTITY disableContextMenus.accesskey "D">
+<!ENTITY moveResizeWindows.label        "āωāχāĻ¨ā§āĻĄā§‹ āϏāϰāĻžāύ⧋ āĻ…āĻĨāĻŦāĻž āφāĻ•āĻžāϰ āĻĒāϰāĻŋāĻŦāĻ°ā§āϤāύ (M)">
+<!ENTITY moveResizeWindows.accesskey    "M">
+<!ENTITY raiseLowerWindows.label        "āωāχāĻ¨ā§āĻĄā§‹ āωāĻĒāϰ⧇ āϤ⧋āϞāĻž āĻŦāĻž āύ⧀āĻšā§‡ āύāĻžāĻŽāĻžāύ⧋ (R)">
+<!ENTITY raiseLowerWindows.accesskey    "R">
+<!ENTITY disableContextMenus.label      "āĻĒā§āϰāĻžāϏāĻ™ā§āĻ—āĻŋāĻ•-āĻŽā§‡āύ⧁ āύāĻŋāĻˇā§āĻ•ā§āϰāĻŋ⧟ āĻ…āĻĨāĻŦāĻž āĻĒā§āϰāϤāĻŋāĻ¸ā§āĻĨāĻžāĻĒāύ āĻ•āϰāĻž (D)">
+<!ENTITY disableContextMenus.accesskey  "D">
--- a/browser/chrome/browser/preferences/advanced.dtd
+++ b/browser/chrome/browser/preferences/advanced.dtd
@@ -1,108 +1,108 @@
 <!-- Note: each tab panel must contain unique accesskeys -->
 
-<!ENTITY generalTab.label "āϏāĻžāϧāĻžāϰāĻŖ">
+<!ENTITY generalTab.label                "āϏāĻžāϧāĻžāϰāĻŖ">
 
-<!ENTITY accessibility.label "āĻ¸ā§āĻŦāĻšā§āĻ›āĻ¨ā§āĻĻāϤāĻž">
+<!ENTITY accessibility.label             "āĻ¸ā§āĻŦāĻšā§āĻ›āĻ¨ā§āĻĻāϤāĻž">
 
-<!ENTITY useCursorNavigation.label "āĻŦāĻŋāĻ­āĻŋāĻ¨ā§āύ āĻĒ⧃āĻˇā§āĻ āĻžāϰ āĻŽāĻ§ā§āϝ⧇ āϚāϞāĻžāϚāϞ⧇āϰ āϜāĻ¨ā§āϝ āϏāĻ°ā§āĻŦāĻĻāĻž āĻ•āĻžāĻ°ā§āϏāĻžāϰ-āϕ⧀ āĻŦā§āϝāĻŦāĻšāĻžāϰ āĻ•āϰāĻž āĻšāĻŦ⧇ (C)">
-<!ENTITY useCursorNavigation.accesskey "C">
-<!ENTITY searchStartTyping.label "āϟāĻžāχāĻĒ āφāϰāĻŽā§āĻ­ āĻ•āϰāϞ⧇ āĻ¤ā§ŽāĻ•ā§āώāĻŖāĻžā§Ž āĻ…āύ⧁āϏāĻ¨ā§āϧāĻžāύ āĻļ⧁āϰ⧁ āĻ•āϰāĻž āĻšāĻŦ⧇ (X)">
-<!ENTITY searchStartTyping.accesskey "X">
-<!ENTITY blockAutoRefresh.label "āĻ“ā§Ÿā§‡āĻŦāϏāĻžāχāϟ āϕ⧋āύ⧋ āĻĒ⧃āĻˇā§āĻ āĻž āϰāĻŋāϞ⧋āĻĄ āĻŦāĻž āϰāĻŋāĻĄāĻŋāϰ⧇āĻ•ā§āϟ āĻ•āϰāĻžāϰ āĻšā§‡āĻˇā§āϟāĻž āĻ•āϰāϞ⧇ āϏāϤāĻ°ā§āĻ• āĻ•āϰāĻž āĻšāĻŦ⧇ (B)">
-<!ENTITY blockAutoRefresh.accesskey "B">
+<!ENTITY useCursorNavigation.label       "āĻŦāĻŋāĻ­āĻŋāĻ¨ā§āύ āĻĒ⧃āĻˇā§āĻ āĻžāϰ āĻŽāĻ§ā§āϝ⧇ āϚāϞāĻžāϚāϞ⧇āϰ āϜāĻ¨ā§āϝ āϏāĻ°ā§āĻŦāĻĻāĻž āĻ•āĻžāĻ°ā§āϏāĻžāϰ-āϕ⧀ āĻŦā§āϝāĻŦāĻšāĻžāϰ āĻ•āϰāĻž āĻšāĻŦ⧇ (C)">
+<!ENTITY useCursorNavigation.accesskey   "C">
+<!ENTITY searchStartTyping.label         "āϟāĻžāχāĻĒ āφāϰāĻŽā§āĻ­ āĻ•āϰāϞ⧇ āĻ¤ā§ŽāĻ•ā§āώāĻŖāĻžā§Ž āĻ…āύ⧁āϏāĻ¨ā§āϧāĻžāύ āĻļ⧁āϰ⧁ āĻ•āϰāĻž āĻšāĻŦ⧇ (X)">
+<!ENTITY searchStartTyping.accesskey     "X">
+<!ENTITY blockAutoRefresh.label          "āĻ“ā§Ÿā§‡āĻŦāϏāĻžāχāϟ āϕ⧋āύ⧋ āĻĒ⧃āĻˇā§āĻ āĻž āϰāĻŋāϞ⧋āĻĄ āĻŦāĻž āϰāĻŋāĻĄāĻŋāϰ⧇āĻ•ā§āϟ āĻ•āϰāĻžāϰ āĻšā§‡āĻˇā§āϟāĻž āĻ•āϰāϞ⧇ āϏāϤāĻ°ā§āĻ• āĻ•āϰāĻž āĻšāĻŦ⧇ (B)">
+<!ENTITY blockAutoRefresh.accesskey      "B">
 
-<!ENTITY browsing.label "āĻŦā§āϰāĻžāωāϜ āĻ•āϰāĻž">
+<!ENTITY browsing.label                  "āĻŦā§āϰāĻžāωāϜ āĻ•āϰāĻž">
 
-<!ENTITY useAutoScroll.label "āĻ¸ā§āĻŦ⧟āĻ‚āĻ•ā§āϰāĻŋ⧟-āĻ¸ā§āĻ•ā§āϰāϞāĻŋāĻ‚ āĻŦā§āϝāĻŦāĻšāĻžāϰ āĻ•āϰāĻž āĻšāĻŦ⧇ (A)">
-<!ENTITY useAutoScroll.accesskey "A">
-<!ENTITY useSmoothScrolling.label "āĻ¸ā§āĻŽā§āĻĨ-āĻ¸ā§āĻ•ā§āϰāϞāĻŋāĻ‚ āĻŦā§āϝāĻŦāĻšāĻžāϰ āĻ•āϰāĻž āĻšāĻŦ⧇ (M)">
-<!ENTITY useSmoothScrolling.accesskey "M">
-<!ENTITY allowHWAccel.label " āĻšāĻžāĻ°ā§āĻĄāĻ“ā§Ÿā§āϝāĻžāϰ āĻāĻ•ā§āϏāĻŋāϞāĻžāϰ⧇āĻļāύ āĻŦāĻŋāĻĻā§āϝāĻŽāĻžāύ āĻĨāĻžāĻ•āϞ⧇ āϤāĻž āĻŦā§āϝāĻŦāĻšāĻžāϰ (h)">
-<!ENTITY allowHWAccel.accesskey "h">
-<!ENTITY checkSpelling.label "āϟāĻžāχāĻĒ āĻ•āϰāĻžāϰ āϏāĻŽā§Ÿ āĻŦāĻžāύāĻžāύ āĻĒāϰ⧀āĻ•ā§āώāĻž āĻ•āϰāĻž āĻšāĻŦ⧇ (T)">
-<!ENTITY checkSpelling.accesskey "T">
+<!ENTITY useAutoScroll.label             "āĻ¸ā§āĻŦ⧟āĻ‚āĻ•ā§āϰāĻŋ⧟-āĻ¸ā§āĻ•ā§āϰāϞāĻŋāĻ‚ āĻŦā§āϝāĻŦāĻšāĻžāϰ āĻ•āϰāĻž āĻšāĻŦ⧇ (A)">
+<!ENTITY useAutoScroll.accesskey         "A">
+<!ENTITY useSmoothScrolling.label        "āĻ¸ā§āĻŽā§āĻĨ-āĻ¸ā§āĻ•ā§āϰāϞāĻŋāĻ‚ āĻŦā§āϝāĻŦāĻšāĻžāϰ āĻ•āϰāĻž āĻšāĻŦ⧇ (M)">
+<!ENTITY useSmoothScrolling.accesskey    "M">
+<!ENTITY allowHWAccel.label              " āĻšāĻžāĻ°ā§āĻĄāĻ“ā§Ÿā§āϝāĻžāϰ āĻāĻ•ā§āϏāĻŋāϞāĻžāϰ⧇āĻļāύ āĻŦāĻŋāĻĻā§āϝāĻŽāĻžāύ āĻĨāĻžāĻ•āϞ⧇ āϤāĻž āĻŦā§āϝāĻŦāĻšāĻžāϰ (h)">
+<!ENTITY allowHWAccel.accesskey          "h">
+<!ENTITY checkSpelling.label             "āϟāĻžāχāĻĒ āĻ•āϰāĻžāϰ āϏāĻŽā§Ÿ āĻŦāĻžāύāĻžāύ āĻĒāϰ⧀āĻ•ā§āώāĻž āĻ•āϰāĻž āĻšāĻŦ⧇ (T)">
+<!ENTITY checkSpelling.accesskey         "T">
 
-<!ENTITY systemDefaults.label "āϏāĻŋāĻ¸ā§āĻŸā§‡āĻŽā§‡āϰ āĻĄāĻŋāĻĢāĻ˛ā§āϟ āĻŽāĻžāύ">
+<!ENTITY systemDefaults.label            "āϏāĻŋāĻ¸ā§āĻŸā§‡āĻŽā§‡āϰ āĻĄāĻŋāĻĢāĻ˛ā§āϟ āĻŽāĻžāύ">
 <!--XXX-->
-<!ENTITY alwaysCheckDefault.label "&brandShortName; āĻĄāĻŋāĻĢāĻ˛ā§āϟ āĻŦā§āϰāĻžāωāϜāĻžāϰ āĻ•āĻŋāύāĻž āϤāĻž āĻĒā§āϰāϤāĻŋāĻŦāĻžāϰ āĻļ⧁āϰ⧁āϤ⧇ āĻĒāϰ⧀āĻ•ā§āώāĻž āĻ•āϰāĻž āĻšāĻŦ⧇ (w) (b)">
-<!ENTITY alwaysCheckDefault.accesskey "w">
-<!ENTITY checkNow.label "āĻāχ āĻŽā§‚āĻšā§āĻ°ā§āϤ⧇ āĻĒāϰ⧀āĻ•ā§āώāĻž āĻ•āϰāĻž āĻšāĻŦ⧇ (N)">
-<!ENTITY checkNow.accesskey "N">
-<!ENTITY submitCrashes.label "āĻ•ā§āĻ°ā§āϝāĻžāĻļ āϰāĻŋāĻĒā§‹āĻ°ā§āϟ āϜāĻŽāĻž āĻĻāĻŋāύ">
-<!ENTITY submitCrashes.accesskey "S">
+<!ENTITY alwaysCheckDefault.label        "&brandShortName; āĻĄāĻŋāĻĢāĻ˛ā§āϟ āĻŦā§āϰāĻžāωāϜāĻžāϰ āĻ•āĻŋāύāĻž āϤāĻž āĻĒā§āϰāϤāĻŋāĻŦāĻžāϰ āĻļ⧁āϰ⧁āϤ⧇ āĻĒāϰ⧀āĻ•ā§āώāĻž āĻ•āϰāĻž āĻšāĻŦ⧇ (w) (b)">
+<!ENTITY alwaysCheckDefault.accesskey    "w">
+<!ENTITY checkNow.label                  "āĻāχ āĻŽā§‚āĻšā§āĻ°ā§āϤ⧇ āĻĒāϰ⧀āĻ•ā§āώāĻž āĻ•āϰāĻž āĻšāĻŦ⧇ (N)">
+<!ENTITY checkNow.accesskey              "N">
+<!ENTITY submitCrashes.label             "āĻ•ā§āĻ°ā§āϝāĻžāĻļ āϰāĻŋāĻĒā§‹āĻ°ā§āϟ āϜāĻŽāĻž āĻĻāĻŋāύ">
+<!ENTITY submitCrashes.accesskey         "S">
 
-<!ENTITY networkTab.label "āύ⧇āϟāĻ“ā§ŸāĻžāĻ°ā§āĻ•">
+<!ENTITY networkTab.label                "āύ⧇āϟāĻ“ā§ŸāĻžāĻ°ā§āĻ•">
 
-<!ENTITY connection.label "āϏāĻ‚āϝ⧋āĻ—">
+<!ENTITY connection.label                "āϏāĻ‚āϝ⧋āĻ—">
 
-<!ENTITY connectionDesc.label "&brandShortName; āχāĻ¨ā§āϟāĻžāϰāύ⧇āĻŸā§‡āϰ āϏāĻžāĻĨ⧇ āĻ•āĻŋāĻ­āĻžāĻŦ⧇ āϏāĻ‚āϝ⧁āĻ•ā§āϤ āĻšāĻŦ⧇ āϤāĻž āĻ•āύāĻĢāĻŋāĻ—āĻžāϰ āĻ•āϰ⧁āύ">
-<!ENTITY connectionSettings.label "āĻŦ⧈āĻļāĻŋāĻˇā§āĻŸā§āϝāĻžāĻŦāϞ⧀... (E)">
-<!ENTITY connectionSettings.accesskey "E">
+<!ENTITY connectionDesc.label            "&brandShortName; āχāĻ¨ā§āϟāĻžāϰāύ⧇āĻŸā§‡āϰ āϏāĻžāĻĨ⧇ āĻ•āĻŋāĻ­āĻžāĻŦ⧇ āϏāĻ‚āϝ⧁āĻ•ā§āϤ āĻšāĻŦ⧇ āϤāĻž āĻ•āύāĻĢāĻŋāĻ—āĻžāϰ āĻ•āϰ⧁āύ">
+<!ENTITY connectionSettings.label        "āĻŦ⧈āĻļāĻŋāĻˇā§āĻŸā§āϝāĻžāĻŦāϞ⧀... (E)">
+<!ENTITY connectionSettings.accesskey    "E">
 
-<!ENTITY offlineStorage.label "āĻ…āĻĢāϞāĻžāχāύ āϏāĻ‚āϰāĻ•ā§āώāĻŖ">
+<!ENTITY offlineStorage.label            "āĻ…āĻĢāϞāĻžāχāύ āϏāĻ‚āϰāĻ•ā§āώāĻŖ">
 <!-- LOCALIZATION NOTE:
   The entities limitCacheSizeBefore.label and limitCacheSizeAfter.label appear on a single
   line in preferences as follows:
 
   &limitCacheSizeBefore.label [textbox for cache size in MB] &limitCacheSizeAfter.label;
 -->
 
-<!ENTITY limitCacheSizeBefore.label "āĻ•ā§āϝāĻžāĻļ⧇āϰ āϏ⧀āĻŽāĻž">
-<!ENTITY limitCacheSizeBefore.accesskey "L">
-<!ENTITY limitCacheSizeAfter.label "āĻŽā§‡āĻ—āĻžāĻŦāĻžāχāϟ āĻĒāĻ°ā§āϝāĻ¨ā§āϤ">
-<!ENTITY clearCacheNow.label "āĻ•ā§āϝāĻžāĻļ āĻĒāϰāĻŋāĻˇā§āĻ•āĻžāϰ āĻ•āϰāĻž āĻšāĻŦ⧇ (C)">
-<!ENTITY clearCacheNow.accesskey "C">
-<!ENTITY overrideSmartCacheSize.label "āĻ¸ā§āĻŦ⧟āĻ‚āĻ•ā§āϰāĻŋ⧟ āĻ•ā§āϝāĻžāĻļ⧇ āĻŦā§āϝāĻŦāĻ¸ā§āĻĨāĻžāĻĒāύāĻž āωāĻĒ⧇āĻ•ā§āώāĻž (O)">
+<!ENTITY limitCacheSizeBefore.label      "āĻ•ā§āϝāĻžāĻļ⧇āϰ āϏ⧀āĻŽāĻž">
+<!ENTITY limitCacheSizeBefore.accesskey  "L">
+<!ENTITY limitCacheSizeAfter.label       "āĻŽā§‡āĻ—āĻžāĻŦāĻžāχāϟ āĻĒāĻ°ā§āϝāĻ¨ā§āϤ">
+<!ENTITY clearCacheNow.label             "āĻ•ā§āϝāĻžāĻļ āĻĒāϰāĻŋāĻˇā§āĻ•āĻžāϰ āĻ•āϰāĻž āĻšāĻŦ⧇ (C)">
+<!ENTITY clearCacheNow.accesskey         "C">
+<!ENTITY overrideSmartCacheSize.label    "āĻ¸ā§āĻŦ⧟āĻ‚āĻ•ā§āϰāĻŋ⧟ āĻ•ā§āϝāĻžāĻļ⧇ āĻŦā§āϝāĻŦāĻ¸ā§āĻĨāĻžāĻĒāύāĻž āωāĻĒ⧇āĻ•ā§āώāĻž (O)">
 <!ENTITY overrideSmartCacheSize.accesskey "O">
 
-<!ENTITY updateTab.label "āĻšāĻžāϞāύāĻžāĻ—āĻžāĻĻ">
+<!ENTITY updateTab.label                 "āĻšāĻžāϞāύāĻžāĻ—āĻžāĻĻ">
 
-<!ENTITY autoCheck.label "āύāĻŋāĻŽā§āύāϞāĻŋāĻ–āĻŋāϤ āφāχāĻŸā§‡āĻŽāϗ⧁āϞ⧋āϰ āϜāĻ¨ā§āϝ āĻ¸ā§āĻŦ⧟āĻ‚āĻ•ā§āϰāĻŋ⧟āĻ­āĻžāĻŦ⧇ āĻšāĻžāϞāύāĻžāĻ—āĻžāĻĻ āĻĒāϰ⧀āĻ•ā§āώāĻž āĻ•āϰāĻž āĻšāĻŦ⧇:">
-<!ENTITY enableAppUpdate.label "&brandShortName; (F)">
-<!ENTITY enableAppUpdate.accesskey "F">
-<!ENTITY enableAddonsUpdate2.label "āĻ…ā§āϝāĻžāĻĄāĻ…āύ (n)">
-<!ENTITY enableAddonsUpdate2.accesskey "n">
-<!ENTITY enableSearchUpdate.label "āĻ…āύ⧁āϏāĻ¨ā§āϧāĻžāύ āχāύāϜāĻŋāύ (H)">
-<!ENTITY enableSearchUpdate.accesskey "H">
-<!ENTITY whenUpdatesFound.label "&brandShortName;-āĻāϰ āĻšāĻžāϞāύāĻžāĻ—āĻžāĻĻ āĻĒāĻžāĻ“ā§ŸāĻž āϗ⧇āϞ⧇:">
-<!ENTITY askMe.label "āĻĒāϰāĻŦāĻ°ā§āϤ⧀ āĻĒāĻĻāĻ•ā§āώ⧇āĻĒ āϏāĻŽā§āĻŦāĻ¨ā§āϧ⧇ āϜāĻŋāĻœā§āĻžā§‡āϏ āĻ•āϰāĻž āĻšāĻŦ⧇ (K)">
-<!ENTITY askMe.accesskey "K">
-<!ENTITY modeAutomatic.label "āĻ¸ā§āĻŦ⧟āĻ‚āĻ•ā§āϰāĻŋ⧟āĻ­āĻžāĻŦ⧇ āĻšāĻžāϞāύāĻžāĻ—āĻžāĻĻ āĻĄāĻžāωāύāϞ⧋āĻĄ āĻ•āϰ⧇ āχāύāĻ¸ā§āϟāϞ āĻ•āϰāĻž āĻšāĻŦ⧇ (D)">
-<!ENTITY modeAutomatic.accesskey "D">
-<!ENTITY modeAutoAddonWarn.label "āϕ⧋āύ āĻā§āϝāĻžāĻĄ-āĻ…āύ āύāĻŋāĻˇā§āĻ•ā§āϰāĻŋ⧟ āĻšāĻ“ā§ŸāĻžāϰ āϏāĻŽā§āĻ­āĻžāĻŦāύāĻž āĻĨāĻžāĻ•āϞ⧇ āϏāϤāĻ°ā§āĻ• āĻ•āϰāĻž āĻšāĻŦ⧇ (W)">
-<!ENTITY modeAutoAddonWarn.accesskey "W">
-<!ENTITY updateHistory.label "āĻšāĻžāϞāύāĻžāĻ—āĻžāĻĻ āχāϤāĻŋāĻšāĻžāϏ āĻĒā§āϰāĻĻāĻ°ā§āĻļāύ (P)">
-<!ENTITY updateHistory.accesskey "P">
+<!ENTITY autoCheck.label                 "āύāĻŋāĻŽā§āύāϞāĻŋāĻ–āĻŋāϤ āφāχāĻŸā§‡āĻŽāϗ⧁āϞ⧋āϰ āϜāĻ¨ā§āϝ āĻ¸ā§āĻŦ⧟āĻ‚āĻ•ā§āϰāĻŋ⧟āĻ­āĻžāĻŦ⧇ āĻšāĻžāϞāύāĻžāĻ—āĻžāĻĻ āĻĒāϰ⧀āĻ•ā§āώāĻž āĻ•āϰāĻž āĻšāĻŦ⧇:">
+<!ENTITY enableAppUpdate.label           "&brandShortName; (F)">
+<!ENTITY enableAppUpdate.accesskey       "F">
+<!ENTITY enableAddonsUpdate2.label       "āĻ…ā§āϝāĻžāĻĄāĻ…āύ (n)">
+<!ENTITY enableAddonsUpdate2.accesskey   "n">
+<!ENTITY enableSearchUpdate.label        "āĻ…āύ⧁āϏāĻ¨ā§āϧāĻžāύ āχāύāϜāĻŋāύ (H)">
+<!ENTITY enableSearchUpdate.accesskey    "H">
+<!ENTITY whenUpdatesFound.label          "&brandShortName;-āĻāϰ āĻšāĻžāϞāύāĻžāĻ—āĻžāĻĻ āĻĒāĻžāĻ“ā§ŸāĻž āϗ⧇āϞ⧇:">
+<!ENTITY askMe.label                     "āĻĒāϰāĻŦāĻ°ā§āϤ⧀ āĻĒāĻĻāĻ•ā§āώ⧇āĻĒ āϏāĻŽā§āĻŦāĻ¨ā§āϧ⧇ āϜāĻŋāĻœā§āĻžā§‡āϏ āĻ•āϰāĻž āĻšāĻŦ⧇ (K)">
+<!ENTITY askMe.accesskey                 "K">
+<!ENTITY modeAutomatic.label             "āĻ¸ā§āĻŦ⧟āĻ‚āĻ•ā§āϰāĻŋ⧟āĻ­āĻžāĻŦ⧇ āĻšāĻžāϞāύāĻžāĻ—āĻžāĻĻ āĻĄāĻžāωāύāϞ⧋āĻĄ āĻ•āϰ⧇ āχāύāĻ¸ā§āϟāϞ āĻ•āϰāĻž āĻšāĻŦ⧇ (D)">
+<!ENTITY modeAutomatic.accesskey         "D">
+<!ENTITY modeAutoAddonWarn.label         "āϕ⧋āύ āĻā§āϝāĻžāĻĄ-āĻ…āύ āύāĻŋāĻˇā§āĻ•ā§āϰāĻŋ⧟ āĻšāĻ“ā§ŸāĻžāϰ āϏāĻŽā§āĻ­āĻžāĻŦāύāĻž āĻĨāĻžāĻ•āϞ⧇ āϏāϤāĻ°ā§āĻ• āĻ•āϰāĻž āĻšāĻŦ⧇ (W)">
+<!ENTITY modeAutoAddonWarn.accesskey     "W">
+<!ENTITY updateHistory.label             "āĻšāĻžāϞāύāĻžāĻ—āĻžāĻĻ āχāϤāĻŋāĻšāĻžāϏ āĻĒā§āϰāĻĻāĻ°ā§āĻļāύ (P)">
+<!ENTITY updateHistory.accesskey         "P">
 
-<!ENTITY offlineNotify.label "āĻ…āĻĢāϞāĻžāχāύ āĻ…āĻŦāĻ¸ā§āĻĨāĻžā§Ÿ āĻŦā§āϝāĻŦāĻšāĻžāϰ⧇āϰ āϜāĻ¨ā§āϝ āϕ⧋āύ⧋ āĻ“ā§Ÿā§‡āĻŦāϏāĻžāχāϟ  āϤāĻĨā§āϝ āϏāĻ‚āϰāĻ•ā§āώāϪ⧇āϰ āĻšā§‡āĻˇā§āϟāĻž āĻ•āϰāϞ⧇ āĻ…āĻŦāĻ—āϤ āĻ•āϰāĻž āĻšāĻŦ⧇ (T)">
-<!ENTITY offlineNotify.accesskey "T">
-<!ENTITY offlineNotifyExceptions.label "āĻŦā§āϝāϤāĻŋāĻ•ā§āϰāĻŽâ€Ļ (X)">
+<!ENTITY offlineNotify.label             "āĻ…āĻĢāϞāĻžāχāύ āĻ…āĻŦāĻ¸ā§āĻĨāĻžā§Ÿ āĻŦā§āϝāĻŦāĻšāĻžāϰ⧇āϰ āϜāĻ¨ā§āϝ āϕ⧋āύ⧋ āĻ“ā§Ÿā§‡āĻŦāϏāĻžāχāϟ  āϤāĻĨā§āϝ āϏāĻ‚āϰāĻ•ā§āώāϪ⧇āϰ āĻšā§‡āĻˇā§āϟāĻž āĻ•āϰāϞ⧇ āĻ…āĻŦāĻ—āϤ āĻ•āϰāĻž āĻšāĻŦ⧇ (T)">
+<!ENTITY offlineNotify.accesskey         "T">
+<!ENTITY offlineNotifyExceptions.label   "āĻŦā§āϝāϤāĻŋāĻ•ā§āϰāĻŽâ€Ļ (X)">
 <!ENTITY offlineNotifyExceptions.accesskey "X">
 
-<!ENTITY offlineAppsList.label "āύāĻŋāĻŽā§āύāϞāĻŋāĻ–āĻŋāϤ āϏāĻžāχāϟāϗ⧁āϞāĻŋ āĻ…āĻĢāϞāĻžāχāύ āĻ…āĻŦāĻ¸ā§āĻĨāĻžā§Ÿ āĻŦā§āϝāĻŦāĻšāĻžāϰ⧇āϰ āωāĻĻā§āĻĻ⧇āĻļā§āϝ⧇ āϤāĻĨā§āϝ āϏāĻ‚āϰāĻ•ā§āώāĻŖ āĻ•āϰ⧇āϛ⧇:">
-<!ENTITY offlineAppsList.height "7em">
-<!ENTITY offlineAppsListRemove.label "āĻŽā§āϛ⧇ āĻĢ⧇āϞāĻž āĻšāĻŦ⧇â€Ļ (R)">
+<!ENTITY offlineAppsList.label           "āύāĻŋāĻŽā§āύāϞāĻŋāĻ–āĻŋāϤ āϏāĻžāχāϟāϗ⧁āϞāĻŋ āĻ…āĻĢāϞāĻžāχāύ āĻ…āĻŦāĻ¸ā§āĻĨāĻžā§Ÿ āĻŦā§āϝāĻŦāĻšāĻžāϰ⧇āϰ āωāĻĻā§āĻĻ⧇āĻļā§āϝ⧇ āϤāĻĨā§āϝ āϏāĻ‚āϰāĻ•ā§āώāĻŖ āĻ•āϰ⧇āϛ⧇:">
+<!ENTITY offlineAppsList.height          "7em">
+<!ENTITY offlineAppsListRemove.label     "āĻŽā§āϛ⧇ āĻĢ⧇āϞāĻž āĻšāĻŦ⧇â€Ļ (R)">
 <!ENTITY offlineAppsListRemove.accesskey "R">
-<!ENTITY offlineAppRemove.confirm "āϏāĻ‚āϰāĻ•ā§āώāĻŋāϤ āĻ…āĻĢāϞāĻžāχāύ āϤāĻĨā§āϝ āĻŽā§āϛ⧇ āĻĢ⧇āϞāĻž āĻšāĻŦ⧇">
+<!ENTITY offlineAppRemove.confirm        "āϏāĻ‚āϰāĻ•ā§āώāĻŋāϤ āĻ…āĻĢāϞāĻžāχāύ āϤāĻĨā§āϝ āĻŽā§āϛ⧇ āĻĢ⧇āϞāĻž āĻšāĻŦ⧇">
 
-<!ENTITY encryptionTab.label "āĻāύāĻ•ā§āϰāĻŋāĻĒāĻļāύ">
+<!ENTITY encryptionTab.label             "āĻāύāĻ•ā§āϰāĻŋāĻĒāĻļāύ">
 
-<!ENTITY protocols.label "āĻĒā§āϰ⧋āĻŸā§‹āĻ•āϞ">
-<!ENTITY useSSL3.label "SSL 3.0 āĻŦā§āϝāĻŦāĻšāĻžāϰ āĻ•āϰāĻž āĻšāĻŦ⧇">
-<!ENTITY useSSL3.accesskey "3">
-<!ENTITY useTLS1.label "TLS 1.0 āĻŦā§āϝāĻŦāĻšāĻžāϰ">
-<!ENTITY useTLS1.accesskey "1">
-<!ENTITY certificates.label "āϏāĻžāĻ°ā§āϟāĻŋāĻĢāĻŋāϕ⧇āϟ">
-<!ENTITY certSelection.description "āϕ⧋āύ⧋ āϏāĻžāĻ°ā§āĻ­āĻžāϰ āφāĻĒāύāĻžāϰ āĻŦā§āϝāĻ•ā§āϤāĻŋāĻ—āϤ āϏāĻžāĻ°ā§āϟāĻŋāĻĢāĻŋāϕ⧇āϟ āĻ…āύ⧁āϰ⧋āϧ āĻ•āϰāϞ⧇:">
-<!ENTITY certs.auto "āĻ¸ā§āĻŦ⧟āĻ‚āĻ•ā§āϰāĻŋ⧟āĻ­āĻžāĻŦ⧇ āύāĻŋāĻ°ā§āĻŦāĻžāϚāύ āĻ•āϰāĻž āĻšāĻŦ⧇ (L)">
-<!ENTITY certs.auto.accesskey "l">
-<!ENTITY certs.ask "āĻĒā§āϰāϤāĻŋāĻŦāĻžāϰ āϜāĻŋāĻœā§āĻžā§‡āϏ āĻ•āϰāĻž āĻšāĻŦ⧇ (I)">
-<!ENTITY certs.ask.accesskey "i">
-<!ENTITY viewCerts.label "āϏāĻžāĻ°ā§āϟāĻŋāĻĢāĻŋāϕ⧇āϟ āĻĒā§āϰāĻĻāĻ°ā§āĻļāύ (S)">
-<!ENTITY viewCerts.accesskey "S">
-<!ENTITY viewCRLs.label "āĻĒā§āϰāĻ¤ā§āϝāĻžāĻšāĻžāϰ āϤāĻžāϞāĻŋāĻ•āĻž (R)">
-<!ENTITY viewCRLs.accesskey "R">
-<!ENTITY verify2.label "āϏāĻ¤ā§āϝāϤāĻž āϝāĻžāϚāĻžāχ (V)">
-<!ENTITY verify2.accesskey "V">
-<!ENTITY viewSecurityDevices.label "āύāĻŋāϰāĻžāĻĒāĻ¤ā§āϤāĻž āĻĄāĻŋāĻ­āĻžāχāϏ (Y)">
-<!ENTITY viewSecurityDevices.accesskey "Y">
+<!ENTITY protocols.label                 "āĻĒā§āϰ⧋āĻŸā§‹āĻ•āϞ">
+<!ENTITY useSSL3.label                   "SSL 3.0 āĻŦā§āϝāĻŦāĻšāĻžāϰ āĻ•āϰāĻž āĻšāĻŦ⧇">
+<!ENTITY useSSL3.accesskey               "3">
+<!ENTITY useTLS1.label                   "TLS 1.0 āĻŦā§āϝāĻŦāĻšāĻžāϰ">
+<!ENTITY useTLS1.accesskey               "1">
+<!ENTITY certificates.label              "āϏāĻžāĻ°ā§āϟāĻŋāĻĢāĻŋāϕ⧇āϟ">
+<!ENTITY certSelection.description       "āϕ⧋āύ⧋ āϏāĻžāĻ°ā§āĻ­āĻžāϰ āφāĻĒāύāĻžāϰ āĻŦā§āϝāĻ•ā§āϤāĻŋāĻ—āϤ āϏāĻžāĻ°ā§āϟāĻŋāĻĢāĻŋāϕ⧇āϟ āĻ…āύ⧁āϰ⧋āϧ āĻ•āϰāϞ⧇:">
+<!ENTITY certs.auto                      "āĻ¸ā§āĻŦ⧟āĻ‚āĻ•ā§āϰāĻŋ⧟āĻ­āĻžāĻŦ⧇ āύāĻŋāĻ°ā§āĻŦāĻžāϚāύ āĻ•āϰāĻž āĻšāĻŦ⧇ (L)">
+<!ENTITY certs.auto.accesskey            "l">
+<!ENTITY certs.ask                       "āĻĒā§āϰāϤāĻŋāĻŦāĻžāϰ āϜāĻŋāĻœā§āĻžā§‡āϏ āĻ•āϰāĻž āĻšāĻŦ⧇ (I)">
+<!ENTITY certs.ask.accesskey             "i">
+<!ENTITY viewCerts.label                 "āϏāĻžāĻ°ā§āϟāĻŋāĻĢāĻŋāϕ⧇āϟ āĻĒā§āϰāĻĻāĻ°ā§āĻļāύ (S)">
+<!ENTITY viewCerts.accesskey             "S">
+<!ENTITY viewCRLs.label                  "āĻĒā§āϰāĻ¤ā§āϝāĻžāĻšāĻžāϰ āϤāĻžāϞāĻŋāĻ•āĻž (R)">
+<!ENTITY viewCRLs.accesskey              "R">
+<!ENTITY verify2.label                   "āϏāĻ¤ā§āϝāϤāĻž āϝāĻžāϚāĻžāχ (V)">
+<!ENTITY verify2.accesskey               "V">
+<!ENTITY viewSecurityDevices.label       "āύāĻŋāϰāĻžāĻĒāĻ¤ā§āϤāĻž āĻĄāĻŋāĻ­āĻžāχāϏ (Y)">
+<!ENTITY viewSecurityDevices.accesskey   "Y">
--- a/browser/chrome/browser/preferences/applicationManager.dtd
+++ b/browser/chrome/browser/preferences/applicationManager.dtd
@@ -1,4 +1,4 @@
-<!ENTITY appManager.title "āĻ…ā§āϝāĻžāĻĒā§āϞāĻŋāϕ⧇āĻļāύ⧇āϰ āĻŦāĻŋāĻŦāϰāĻŖ">
-<!ENTITY appManager.style "width: 30em; min-height: 20em;">
-<!ENTITY remove.label "āĻ…āĻĒāϏāĻžāϰāĻŖ (R)">
-<!ENTITY remove.accesskey "R">
+<!ENTITY appManager.title     "āĻ…ā§āϝāĻžāĻĒā§āϞāĻŋāϕ⧇āĻļāύ⧇āϰ āĻŦāĻŋāĻŦāϰāĻŖ">
+<!ENTITY appManager.style     "width: 30em; min-height: 20em;">
+<!ENTITY remove.label         "āĻ…āĻĒāϏāĻžāϰāĻŖ (R)">
+<!ENTITY remove.accesskey     "R">
--- a/browser/chrome/browser/preferences/applications.dtd
+++ b/browser/chrome/browser/preferences/applications.dtd
@@ -1,10 +1,10 @@
-<!ENTITY typeColumn.label "āĻŦāĻŋāώ⧟āĻŦāĻ¸ā§āϤ⧁āϰ āϧāϰāĻŖ (T)">
-<!ENTITY typeColumn.accesskey "T">
+<!ENTITY  typeColumn.label        "āĻŦāĻŋāώ⧟āĻŦāĻ¸ā§āϤ⧁āϰ āϧāϰāĻŖ (T)">
+<!ENTITY  typeColumn.accesskey    "T">
 
-<!ENTITY actionColumn2.label "āĻ•āϰāĻŖā§€ā§Ÿ (A)">
-<!ENTITY actionColumn2.accesskey "A">
+<!ENTITY  actionColumn2.label     "āĻ•āϰāĻŖā§€ā§Ÿ (A)">
+<!ENTITY  actionColumn2.accesskey "A">
 
-<!ENTITY focusSearch1.key "f">
-<!ENTITY focusSearch2.key "k">
+<!ENTITY  focusSearch1.key        "f">
+<!ENTITY  focusSearch2.key        "k">
 
-<!ENTITY filter.emptytext "āĻ…āύ⧁āϏāĻ¨ā§āϧāĻžāύ">
+<!ENTITY  filter.emptytext        "āĻ…āύ⧁āϏāĻ¨ā§āϧāĻžāύ">
--- a/browser/chrome/browser/preferences/colors.dtd
+++ b/browser/chrome/browser/preferences/colors.dtd
@@ -1,22 +1,22 @@
-<!ENTITY colorsDialog.title "āϰāĻ‚">
-<!ENTITY window.width "38em">
-<!ENTITY window.macWidth "41em">
+<!ENTITY  colorsDialog.title              "āϰāĻ‚">
+<!ENTITY  window.width                    "38em">
+<!ENTITY  window.macWidth                 "41em">
 
-<!ENTITY allowPagesToUse.label "āωāĻĒāϰ⧇ āύāĻŋāĻ°ā§āĻŦāĻžāϚāĻŋāϤ āĻŽāĻžāύ⧇āϰ āĻĒāϰāĻŋāĻŦāĻ°ā§āϤ⧇, āĻĒ⧃āĻˇā§āĻ āĻžāϗ⧁āϞ⧋ āύāĻŋāϜāĻ¸ā§āĻŦ āϰāĻ‚ āύāĻŋāĻ°ā§āĻŦāĻžāϚāύ āĻ•āϰāϤ⧇ āĻĒāĻžāϰāĻŦ⧇ (A)">
-<!ENTITY allowPagesToUse.accesskey "A">
+<!ENTITY  allowPagesToUse.label           "āωāĻĒāϰ⧇ āύāĻŋāĻ°ā§āĻŦāĻžāϚāĻŋāϤ āĻŽāĻžāύ⧇āϰ āĻĒāϰāĻŋāĻŦāĻ°ā§āϤ⧇, āĻĒ⧃āĻˇā§āĻ āĻžāϗ⧁āϞ⧋ āύāĻŋāϜāĻ¸ā§āĻŦ āϰāĻ‚ āύāĻŋāĻ°ā§āĻŦāĻžāϚāύ āĻ•āϰāϤ⧇ āĻĒāĻžāϰāĻŦ⧇ (A)">
+<!ENTITY  allowPagesToUse.accesskey       "A">
 
-<!ENTITY color "āϞ⧇āĻ–āĻž āĻ“ āĻĒāϟāĻ­ā§‚āĻŽāĻŋ">
-<!ENTITY textColor.label "āϞ⧇āĻ–āĻž (T):">
-<!ENTITY textColor.accesskey "T">
-<!ENTITY backgroundColor.label "āĻĒāϟāĻ­ā§‚āĻŽāĻŋ (B):">
-<!ENTITY backgroundColor.accesskey "B">
-<!ENTITY useSystemColors.label "āϏāĻŋāĻ¸ā§āĻŸā§‡āĻŽā§‡āϰ āϰāĻ‚ āĻŦā§āϝāĻŦāĻšāĻžāϰ āĻ•āϰāĻž āĻšāĻŦ⧇ (S)">
-<!ENTITY useSystemColors.accesskey "S">
+<!ENTITY  color                           "āϞ⧇āĻ–āĻž āĻ“ āĻĒāϟāĻ­ā§‚āĻŽāĻŋ">
+<!ENTITY  textColor.label                 "āϞ⧇āĻ–āĻž (T):">
+<!ENTITY  textColor.accesskey             "T">
+<!ENTITY  backgroundColor.label           "āĻĒāϟāĻ­ā§‚āĻŽāĻŋ (B):">
+<!ENTITY  backgroundColor.accesskey       "B">
+<!ENTITY  useSystemColors.label           "āϏāĻŋāĻ¸ā§āĻŸā§‡āĻŽā§‡āϰ āϰāĻ‚ āĻŦā§āϝāĻŦāĻšāĻžāϰ āĻ•āϰāĻž āĻšāĻŦ⧇ (S)">
+<!ENTITY  useSystemColors.accesskey       "S">
 
-<!ENTITY underlineLinks.label "āϞāĻŋāĻ‚āĻ• āύāĻŋāĻŽā§āύāϰ⧇āĻ–āĻžāĻ™ā§āĻ•āĻŋāϤ āĻ•āϰāĻž āĻšāĻŦ⧇ (U)">
-<!ENTITY underlineLinks.accesskey "U">
-<!ENTITY links "āϞāĻŋāĻ‚āϕ⧇āϰ āϰāĻ‚">
-<!ENTITY linkColor.label "āĻ…āĻĒāϰāĻŋāĻĻāĻ°ā§āĻļāĻŋāϤ āϞāĻŋāĻ‚āĻ• (L):">
-<!ENTITY linkColor.accesskey "L">
-<!ENTITY visitedLinkColor.label "āĻĒāϰāĻŋāĻĻāĻ°ā§āĻļāĻŋāϤ āϞāĻŋāĻ‚āĻ• (V):">
-<!ENTITY visitedLinkColor.accesskey "V">
+<!ENTITY  underlineLinks.label            "āϞāĻŋāĻ‚āĻ• āύāĻŋāĻŽā§āύāϰ⧇āĻ–āĻžāĻ™ā§āĻ•āĻŋāϤ āĻ•āϰāĻž āĻšāĻŦ⧇ (U)">
+<!ENTITY  underlineLinks.accesskey        "U">
+<!ENTITY  links                           "āϞāĻŋāĻ‚āϕ⧇āϰ āϰāĻ‚">
+<!ENTITY  linkColor.label                 "āĻ…āĻĒāϰāĻŋāĻĻāĻ°ā§āĻļāĻŋāϤ āϞāĻŋāĻ‚āĻ• (L):">
+<!ENTITY  linkColor.accesskey             "L">
+<!ENTITY  visitedLinkColor.label          "āĻĒāϰāĻŋāĻĻāĻ°ā§āĻļāĻŋāϤ āϞāĻŋāĻ‚āĻ• (V):">
+<!ENTITY  visitedLinkColor.accesskey      "V">
--- a/browser/chrome/browser/preferences/connection.dtd
+++ b/browser/chrome/browser/preferences/connection.dtd
@@ -1,40 +1,40 @@
 
-<!ENTITY connectionsDialog.title "āϏāĻ‚āϝ⧋āϗ⧇āϰ āϏ⧇āϟāĻŋāĻ‚">
-<!ENTITY window.width "37em">
-<!ENTITY window.macWidth "39em">
+<!ENTITY  connectionsDialog.title       "āϏāĻ‚āϝ⧋āϗ⧇āϰ āϏ⧇āϟāĻŋāĻ‚">
+<!ENTITY  window.width                  "37em">
+<!ENTITY  window.macWidth               "39em">
 
-<!ENTITY proxyTitle.label "āχāĻ¨ā§āϟāĻžāϰāύ⧇āϟ āϏāĻ‚āϝ⧋āϗ⧇āϰ āϜāĻ¨ā§āϝ āĻĒā§āϰāĻ•ā§āϏāĻŋ āĻ•āύāĻĢāĻŋāĻ—āĻžāϰ⧇āĻļāύ">
-<!ENTITY noProxyTypeRadio.label "āϕ⧋āύ āĻĒā§āϰāĻ•ā§āϏāĻŋ āύ⧟ (y)">
-<!ENTITY noProxyTypeRadio.accesskey "y">
-<!ENTITY systemTypeRadio.label "āϏāĻŋāĻ¸ā§āĻŸā§‡āĻŽ āĻĒā§āϰāĻ•ā§āϏāĻŋāϰ āϏ⧇āϟāĻŋāĻ‚ āĻŦā§āϝāĻŦāĻšāĻžāϰ āĻ•āϰāĻž āĻšāĻŦ⧇ (U)">
-<!ENTITY systemTypeRadio.accesskey "U">
-<!ENTITY WPADTypeRadio.label "āĻāχ āύ⧇āϟāĻ“ā§ŸāĻžāĻ°ā§āϕ⧇āϰ āĻĒā§āϰāĻ•ā§āϏāĻŋ āϏ⧇āϟāĻŋāĻ‚ āĻ¸ā§āĻŦ⧟āĻ‚āĻ•ā§āϰāĻŋ⧟-āĻļāύāĻžāĻ•ā§āϤ āĻ•āϰāĻž āĻšāĻŦ⧇ (w)">
-<!ENTITY WPADTypeRadio.accesskey "w">
-<!ENTITY manualTypeRadio.label "āĻ¸ā§āĻŦāύāĻŋāĻ°ā§āϧāĻžāϰāĻŋāϤ āĻĒā§āϰāĻ•ā§āϏāĻŋ āĻ•āύāĻĢāĻŋāĻ—āĻžāϰ⧇āĻļāύ (M):">
-<!ENTITY manualTypeRadio.accesskey "M">
-<!ENTITY autoTypeRadio.label "āĻ¸ā§āĻŦ⧟āĻ‚āĻ•ā§āϰāĻŋ⧟ āĻĒā§āϰāĻ•ā§āϏāĻŋ āĻ•āύāĻĢāĻŋāĻ—āĻžāϰ āĻ•āϰāĻžāϰ URL (A):">
-<!ENTITY autoTypeRadio.accesskey "A">
-<!ENTITY reload.label "āĻĒ⧁āύāϰāĻžā§Ÿ āϞ⧋āĻĄ (e)">
-<!ENTITY reload.accesskey "e">
-<!ENTITY ftp.label "FTP āĻĒā§āϰāĻ•ā§āϏāĻŋ (F):">
-<!ENTITY ftp.accesskey "F">
-<!ENTITY http.label "HTTP āĻĒā§āϰāĻ•ā§āϏāĻŋ (x):">
-<!ENTITY http.accesskey "x">
-<!ENTITY ssl.label "SSL āĻĒā§āϰāĻ•ā§āϏāĻŋ (L):">
-<!ENTITY ssl.accesskey "L">
-<!ENTITY socks.label "SOCKS āĻšā§‹āĻ¸ā§āϟ (C):">
-<!ENTITY socks.accesskey "C">
-<!ENTITY socks4.label "SOCKS v4 (K)">
-<!ENTITY socks4.accesskey "K">
-<!ENTITY socks5.label "SOCKS v5 (v)">
-<!ENTITY socks5.accesskey "v">
-<!ENTITY port.label "āĻĒā§‹āĻ°ā§āϟ (P):">
-<!ENTITY HTTPport.accesskey "P">
-<!ENTITY SSLport.accesskey "o">
-<!ENTITY FTPport.accesskey "r">
-<!ENTITY SOCKSport.accesskey "t">
-<!ENTITY noproxy.label "āĻ…āύ⧁āĻĒāĻ¸ā§āĻĨāĻŋāϤ āĻĒā§āϰāĻ•ā§āϏāĻŋ (N):">
-<!ENTITY noproxy.accesskey "N">
-<!ENTITY noproxyExplain.label "āωāĻĻāĻžāĻšāϰāĻŖ: .mozilla.org, .net.nz, 192.168.1.0/24">
-<!ENTITY shareproxy.label "āϏāĻŦ āĻĒā§āϰ⧋āĻŸā§‹āĻ•āϞ⧇āϰ āϜāĻ¨ā§āϝ āĻāĻ•āχ āĻĒā§āϰāĻ•ā§āϏāĻŋ āĻŦā§āϝāĻŦāĻšāĻžāϰ āĻ•āϰāĻž āĻšāĻŦ⧇ (s)">
-<!ENTITY shareproxy.accesskey "s">
+<!ENTITY  proxyTitle.label              "āχāĻ¨ā§āϟāĻžāϰāύ⧇āϟ āϏāĻ‚āϝ⧋āϗ⧇āϰ āϜāĻ¨ā§āϝ āĻĒā§āϰāĻ•ā§āϏāĻŋ āĻ•āύāĻĢāĻŋāĻ—āĻžāϰ⧇āĻļāύ">
+<!ENTITY  noProxyTypeRadio.label        "āϕ⧋āύ āĻĒā§āϰāĻ•ā§āϏāĻŋ āύ⧟ (y)">
+<!ENTITY  noProxyTypeRadio.accesskey    "y">
+<!ENTITY  systemTypeRadio.label         "āϏāĻŋāĻ¸ā§āĻŸā§‡āĻŽ āĻĒā§āϰāĻ•ā§āϏāĻŋāϰ āϏ⧇āϟāĻŋāĻ‚ āĻŦā§āϝāĻŦāĻšāĻžāϰ āĻ•āϰāĻž āĻšāĻŦ⧇ (U)">
+<!ENTITY  systemTypeRadio.accesskey     "U">
+<!ENTITY  WPADTypeRadio.label           "āĻāχ āύ⧇āϟāĻ“ā§ŸāĻžāĻ°ā§āϕ⧇āϰ āĻĒā§āϰāĻ•ā§āϏāĻŋ āϏ⧇āϟāĻŋāĻ‚ āĻ¸ā§āĻŦ⧟āĻ‚āĻ•ā§āϰāĻŋ⧟-āĻļāύāĻžāĻ•ā§āϤ āĻ•āϰāĻž āĻšāĻŦ⧇ (w)">
+<!ENTITY  WPADTypeRadio.accesskey       "w">
+<!ENTITY  manualTypeRadio.label         "āĻ¸ā§āĻŦāύāĻŋāĻ°ā§āϧāĻžāϰāĻŋāϤ āĻĒā§āϰāĻ•ā§āϏāĻŋ āĻ•āύāĻĢāĻŋāĻ—āĻžāϰ⧇āĻļāύ (M):">
+<!ENTITY  manualTypeRadio.accesskey     "M">
+<!ENTITY  autoTypeRadio.label           "āĻ¸ā§āĻŦ⧟āĻ‚āĻ•ā§āϰāĻŋ⧟ āĻĒā§āϰāĻ•ā§āϏāĻŋ āĻ•āύāĻĢāĻŋāĻ—āĻžāϰ āĻ•āϰāĻžāϰ URL (A):">
+<!ENTITY  autoTypeRadio.accesskey       "A">
+<!ENTITY  reload.label                  "āĻĒ⧁āύāϰāĻžā§Ÿ āϞ⧋āĻĄ (e)">
+<!ENTITY  reload.accesskey              "e">
+<!ENTITY  ftp.label                     "FTP āĻĒā§āϰāĻ•ā§āϏāĻŋ (F):">
+<!ENTITY  ftp.accesskey                 "F">
+<!ENTITY  http.label                    "HTTP āĻĒā§āϰāĻ•ā§āϏāĻŋ (x):">
+<!ENTITY  http.accesskey                "x">
+<!ENTITY  ssl.label                     "SSL āĻĒā§āϰāĻ•ā§āϏāĻŋ (L):">
+<!ENTITY  ssl.accesskey                 "L">
+<!ENTITY  socks.label                   "SOCKS āĻšā§‹āĻ¸ā§āϟ (C):">
+<!ENTITY  socks.accesskey               "C">
+<!ENTITY  socks4.label                  "SOCKS v4 (K)">
+<!ENTITY  socks4.accesskey              "K">
+<!ENTITY  socks5.label                  "SOCKS v5 (v)">
+<!ENTITY  socks5.accesskey              "v">
+<!ENTITY  port.label                    "āĻĒā§‹āĻ°ā§āϟ (P):">
+<!ENTITY  HTTPport.accesskey            "P">
+<!ENTITY  SSLport.accesskey             "o">
+<!ENTITY  FTPport.accesskey             "r">
+<!ENTITY  SOCKSport.accesskey           "t">
+<!ENTITY  noproxy.label                 "āĻ…āύ⧁āĻĒāĻ¸ā§āĻĨāĻŋāϤ āĻĒā§āϰāĻ•ā§āϏāĻŋ (N):">
+<!ENTITY  noproxy.accesskey             "N">
+<!ENTITY  noproxyExplain.label          "āωāĻĻāĻžāĻšāϰāĻŖ: .mozilla.org, .net.nz, 192.168.1.0/24">
+<!ENTITY  shareproxy.label              "āϏāĻŦ āĻĒā§āϰ⧋āĻŸā§‹āĻ•āϞ⧇āϰ āϜāĻ¨ā§āϝ āĻāĻ•āχ āĻĒā§āϰāĻ•ā§āϏāĻŋ āĻŦā§āϝāĻŦāĻšāĻžāϰ āĻ•āϰāĻž āĻšāĻŦ⧇ (s)">
+<!ENTITY  shareproxy.accesskey          "s">
--- a/browser/chrome/browser/preferences/content.dtd
+++ b/browser/chrome/browser/preferences/content.dtd
@@ -1,37 +1,37 @@
-<!ENTITY blockPopups.label "āĻĒāĻĒ-āφāĻĒ āωāχāĻ¨ā§āĻĄā§‹ āϰ⧋āϧ āĻ•āϰāĻž āĻšāĻŦ⧇ (B)">
-<!ENTITY blockPopups.accesskey "B">
-<!ENTITY popupExceptions.label "āĻŦā§āϝāϤāĻŋāĻ•ā§āϰāĻŽ (E)...">
-<!ENTITY popupExceptions.accesskey "E">
+<!ENTITY  blockPopups.label           "āĻĒāĻĒ-āφāĻĒ āωāχāĻ¨ā§āĻĄā§‹ āϰ⧋āϧ āĻ•āϰāĻž āĻšāĻŦ⧇ (B)">
+<!ENTITY  blockPopups.accesskey       "B">
+<!ENTITY  popupExceptions.label       "āĻŦā§āϝāϤāĻŋāĻ•ā§āϰāĻŽ (E)...">
+<!ENTITY  popupExceptions.accesskey   "E">
 
-<!ENTITY loadImages.label "āĻ›āĻŦāĻŋ āĻ¸ā§āĻŦ⧟āĻ‚āĻ•ā§āϰāĻŋ⧟āĻ­āĻžāĻŦ⧇ āϞ⧋āĻĄ āĻ•āϰāĻž āĻšāĻŦ⧇ (I)">
-<!ENTITY loadImages.accesskey "I">
-<!ENTITY exceptions.label "āĻŦā§āϝāϤāĻŋāĻ•ā§āϰāĻŽ... (X)">
-<!ENTITY exceptions.accesskey "X">
+<!ENTITY  loadImages.label            "āĻ›āĻŦāĻŋ āĻ¸ā§āĻŦ⧟āĻ‚āĻ•ā§āϰāĻŋ⧟āĻ­āĻžāĻŦ⧇ āϞ⧋āĻĄ āĻ•āϰāĻž āĻšāĻŦ⧇ (I)">
+<!ENTITY  loadImages.accesskey        "I">
+<!ENTITY  exceptions.label            "āĻŦā§āϝāϤāĻŋāĻ•ā§āϰāĻŽ... (X)">
+<!ENTITY  exceptions.accesskey        "X">
 
-<!ENTITY enableJavaScript.label "JavaScript āϏāĻ•ā§āϰāĻŋ⧟ āĻ•āϰāĻž āĻšāĻŦ⧇ (J)">
-<!ENTITY enableJavaScript.accesskey "J">
-<!ENTITY advancedJS.label "āωāĻšā§āϚāĻĒāĻ°ā§āϝāĻžā§Ÿā§‡āϰ... (v)">
-<!ENTITY advancedJS.accesskey "v">
+<!ENTITY  enableJavaScript.label      "JavaScript āϏāĻ•ā§āϰāĻŋ⧟ āĻ•āϰāĻž āĻšāĻŦ⧇ (J)">
+<!ENTITY  enableJavaScript.accesskey  "J">
+<!ENTITY  advancedJS.label            "āωāĻšā§āϚāĻĒāĻ°ā§āϝāĻžā§Ÿā§‡āϰ... (v)">
+<!ENTITY  advancedJS.accesskey        "v">
 
-<!ENTITY enableJava.label "āϜāĻžāĻ­āĻž āϏāĻ•ā§āϰāĻŋ⧟ āĻ•āϰāĻž āĻšāĻŦ⧇ (n)">
-<!ENTITY enableJava.accesskey "n">
+<!ENTITY  enableJava.label            "āϜāĻžāĻ­āĻž āϏāĻ•ā§āϰāĻŋ⧟ āĻ•āϰāĻž āĻšāĻŦ⧇ (n)">
+<!ENTITY  enableJava.accesskey        "n">
 
 
-<!ENTITY fontsAndColors.label "āĻĢāĻ¨ā§āϟ āĻ“ āϰāĻ‚ (a)">
+<!ENTITY  fontsAndColors.label        "āĻĢāĻ¨ā§āϟ āĻ“ āϰāĻ‚ (a)">
 
-<!ENTITY defaultFont.label "āĻĄāĻŋāĻĢāĻ˛ā§āϟ āĻĢāĻ¨ā§āϟ (D):">
-<!ENTITY defaultFont.accesskey "D">
-<!ENTITY defaultSize.label "āφāĻ•āĻžāϰ (S):">
-<!ENTITY defaultSize.accesskey "S">
+<!ENTITY  defaultFont.label           "āĻĄāĻŋāĻĢāĻ˛ā§āϟ āĻĢāĻ¨ā§āϟ (D):">
+<!ENTITY  defaultFont.accesskey       "D">
+<!ENTITY  defaultSize.label           "āφāĻ•āĻžāϰ (S):">
+<!ENTITY  defaultSize.accesskey       "S">
 
-<!ENTITY advancedFonts.label "āωāĻšā§āϚāĻĒāĻ°ā§āϝāĻžā§Ÿā§‡āϰ...  (A)">
-<!ENTITY advancedFonts.accesskey "A">
+<!ENTITY  advancedFonts.label         "āωāĻšā§āϚāĻĒāĻ°ā§āϝāĻžā§Ÿā§‡āϰ...  (A)">
+<!ENTITY  advancedFonts.accesskey     "A">
 
-<!ENTITY colors.label "āϰāĻ‚... (C)">
-<!ENTITY colors.accesskey "C">
+<!ENTITY  colors.label                "āϰāĻ‚... (C)">
+<!ENTITY  colors.accesskey            "C">
 
 
-<!ENTITY languages.label "āĻ­āĻžāώāĻž">
-<!ENTITY chooseLanguage.label "āĻĒ⧃āĻˇā§āĻ āĻž āĻĒā§āϰāĻĻāĻ°ā§āĻļāύ⧇āϰ āĻĒāĻ›āĻ¨ā§āĻĻāϏāχ āĻ­āĻžāώāĻž āύāĻŋāĻ°ā§āĻŦāĻžāϚāύ">
-<!ENTITY chooseButton.label "āύāĻŋāĻ°ā§āĻŦāĻžāϚāύâ€Ļ (o)">
-<!ENTITY chooseButton.accesskey "o">
+<!ENTITY languages.label              "āĻ­āĻžāώāĻž">
+<!ENTITY chooseLanguage.label         "āĻĒ⧃āĻˇā§āĻ āĻž āĻĒā§āϰāĻĻāĻ°ā§āĻļāύ⧇āϰ āĻĒāĻ›āĻ¨ā§āĻĻāϏāχ āĻ­āĻžāώāĻž āύāĻŋāĻ°ā§āĻŦāĻžāϚāύ">
+<!ENTITY chooseButton.label           "āύāĻŋāĻ°ā§āĻŦāĻžāϚāύâ€Ļ (o)">
+<!ENTITY chooseButton.accesskey       "o">
--- a/browser/chrome/browser/preferences/cookies.dtd
+++ b/browser/chrome/browser/preferences/cookies.dtd
@@ -1,28 +1,28 @@
-<!ENTITY window.width "36em">
+<!ENTITY window.width                       "36em">
 
-<!ENTITY cookiesonsystem.label "āύāĻŋāĻŽā§āύāϞāĻŋāĻ–āĻŋāϤ āϕ⧁āĻ•āĻŋāϗ⧁āϞāĻŋ āφāĻĒāύāĻžāϰ āĻ•āĻŽā§āĻĒāĻŋāωāϟāĻžāϰ⧇ āϏāĻ‚āϰāĻ•ā§āώāĻŋāϤ āφāϛ⧇:">
-<!ENTITY cookiename.label "āϕ⧁āĻ•āĻŋāϰ āύāĻžāĻŽ">
-<!ENTITY cookiedomain.label "āϏāĻžāχāϟ">
-<!ENTITY button.removecookies.label "āϕ⧁āĻ•āĻŋ āĻ…āĻĒāϏāĻžāϰāĻŖ">
-<!ENTITY button.removecookie.label "āϕ⧁āĻ•āĻŋ āĻ…āĻĒāϏāĻžāϰāĻŖ (R)">
-<!ENTITY button.removecookie.accesskey "R">
-<!ENTITY button.removeallcookies.label "āϏāĻŦ āϕ⧁āĻ•āĻŋ āĻ…āĻĒāϏāĻžāϰāĻŖ (A)">
-<!ENTITY button.removeallcookies.accesskey "A">
+<!ENTITY     cookiesonsystem.label          "āύāĻŋāĻŽā§āύāϞāĻŋāĻ–āĻŋāϤ āϕ⧁āĻ•āĻŋāϗ⧁āϞāĻŋ āφāĻĒāύāĻžāϰ āĻ•āĻŽā§āĻĒāĻŋāωāϟāĻžāϰ⧇ āϏāĻ‚āϰāĻ•ā§āώāĻŋāϤ āφāϛ⧇:">
+<!ENTITY     cookiename.label               "āϕ⧁āĻ•āĻŋāϰ āύāĻžāĻŽ">
+<!ENTITY     cookiedomain.label             "āϏāĻžāχāϟ">
+<!ENTITY     button.removecookies.label     "āϕ⧁āĻ•āĻŋ āĻ…āĻĒāϏāĻžāϰāĻŖ">
+<!ENTITY     button.removecookie.label      "āϕ⧁āĻ•āĻŋ āĻ…āĻĒāϏāĻžāϰāĻŖ (R)">
+<!ENTITY     button.removecookie.accesskey  "R">
+<!ENTITY     button.removeallcookies.label  "āϏāĻŦ āϕ⧁āĻ•āĻŋ āĻ…āĻĒāϏāĻžāϰāĻŖ (A)">
+<!ENTITY     button.removeallcookies.accesskey "A">
 
-<!ENTITY props.name.label "āύāĻžāĻŽ:">
-<!ENTITY props.value.label "āĻŦāĻŋāώ⧟āĻŦāĻ¸ā§āϤ⧁:">
-<!ENTITY props.domain.label "āĻšā§‹āĻ¸ā§āϟ:">
-<!ENTITY props.path.label "āĻĒāĻžāĻĨ:">
-<!ENTITY props.secure.label "āĻŦā§āϝāĻŦāĻšā§ƒāϤ āϏāĻ‚āϝ⧋āĻ—:">
-<!ENTITY props.expires.label "āĻŽā§‡ā§ŸāĻžāĻĻ:">
+<!ENTITY     props.name.label               "āύāĻžāĻŽ:">
+<!ENTITY     props.value.label              "āĻŦāĻŋāώ⧟āĻŦāĻ¸ā§āϤ⧁:">
+<!ENTITY     props.domain.label             "āĻšā§‹āĻ¸ā§āϟ:">
+<!ENTITY     props.path.label               "āĻĒāĻžāĻĨ:">
+<!ENTITY     props.secure.label             "āĻŦā§āϝāĻŦāĻšā§ƒāϤ āϏāĻ‚āϝ⧋āĻ—:">
+<!ENTITY     props.expires.label            "āĻŽā§‡ā§ŸāĻžāĻĻ:">
 
-<!ENTITY window.title "āϕ⧁āĻ•āĻŋ">
-<!ENTITY windowClose.key "w">
-<!ENTITY focusSearch1.key "f">
-<!ENTITY focusSearch2.key "k">
+<!ENTITY     window.title                   "āϕ⧁āĻ•āĻŋ">
+<!ENTITY     windowClose.key                "w">
+<!ENTITY     focusSearch1.key               "f">
+<!ENTITY     focusSearch2.key               "k">
 
-<!ENTITY filter.label "āĻ…āύ⧁āϏāĻ¨ā§āϧāĻžāύ (S):">
-<!ENTITY filter.accesskey "S">
+<!ENTITY     filter.label                   "āĻ…āύ⧁āϏāĻ¨ā§āϧāĻžāύ (S):">
+<!ENTITY     filter.accesskey               "S">
 
-<!ENTITY button.close.label "āĻŦāĻ¨ā§āϧ (C)">
-<!ENTITY button.close.accesskey "C">
+<!ENTITY     button.close.label             "āĻŦāĻ¨ā§āϧ (C)">
+<!ENTITY     button.close.accesskey         "C">
--- a/browser/chrome/browser/preferences/fonts.dtd
+++ b/browser/chrome/browser/preferences/fonts.dtd
@@ -1,69 +1,69 @@
-<!ENTITY fontsDialog.title "āĻĢāĻ¨ā§āϟ">
-<!ENTITY window.width "39em">
-<!ENTITY window.macWidth "43em">
-<!ENTITY window.unixWidth "41em">
+<!ENTITY  fontsDialog.title                       "āĻĢāĻ¨ā§āϟ">
+<!ENTITY  window.width                            "39em">
+<!ENTITY  window.macWidth                         "43em">
+<!ENTITY  window.unixWidth                        "41em">
 
-<!ENTITY language.label "āĻĢāĻ¨ā§āϟ: (F)">
-<!ENTITY language.accesskey "F">
+<!ENTITY  language.label                          "āĻĢāĻ¨ā§āϟ: (F)">
+<!ENTITY  language.accesskey                      "F">
 
-<!ENTITY size.label "āφāĻ•āĻžāϰ:">
-<!ENTITY sizeProportional.accesskey "z">
-<!ENTITY sizeMonospace.accesskey "e">
+<!ENTITY  size.label                              "āφāĻ•āĻžāϰ:">
+<!ENTITY  sizeProportional.accesskey              "z">
+<!ENTITY  sizeMonospace.accesskey                 "e">
 
-<!ENTITY proportional.label "āφāύ⧁āĻĒāĻžāϤāĻŋāĻ• (P):">
-<!ENTITY proportional.accesskey "P">
+<!ENTITY  proportional.label                      "āφāύ⧁āĻĒāĻžāϤāĻŋāĻ• (P):">
+<!ENTITY  proportional.accesskey                  "P">
 
-<!ENTITY serif.label "Serif:">
-<!ENTITY serif.accesskey "S">
-<!ENTITY sans-serif.label "Sans-serif:">
-<!ENTITY sans-serif.accesskey "n">
-<!ENTITY monospace.label "Monospace:">
-<!ENTITY monospace.accesskey "M">
+<!ENTITY  serif.label                             "Serif:">
+<!ENTITY  serif.accesskey                         "S">
+<!ENTITY  sans-serif.label                        "Sans-serif:">
+<!ENTITY  sans-serif.accesskey                    "n">
+<!ENTITY  monospace.label                         "Monospace:">
+<!ENTITY  monospace.accesskey                     "M">
 
-<!ENTITY font.langGroup.latin1 "āĻĒāĻļā§āϚāĻŋāĻŽāĻŋ">
-<!ENTITY font.langGroup.latin2 "āĻŽāĻ§ā§āϝ āχāωāϰ⧋āĻĒāĻŋāϝāĻŧ">
-<!ENTITY font.langGroup.japanese "āϜāĻžāĻĒāĻžāύāĻŋ">
-<!ENTITY font.langGroup.trad-chinese "āϏāύāĻžāϤāύ āĻšā§€āύāĻž (āϤāĻžāχāĻ“ā§ŸāĻžāύ)">
-<!ENTITY font.langGroup.simpl-chinese "āϏāϰāϞāĻ•ā§ƒāϤ āĻšā§€āύāĻž">
-<!ENTITY font.langGroup.trad-chinese-hk "āϏāύāĻžāϤāύ āĻšā§€āύāĻž (āĻšāĻ‚ āĻ•āĻ‚)">
-<!ENTITY font.langGroup.korean "āϕ⧋āϰāĻŋ⧟āĻžāύ">
-<!ENTITY font.langGroup.cyrillic "āϏāĻŋāϰāĻŋāϞāĻŋāĻ•">
-<!ENTITY font.langGroup.baltic "āĻŦāĻžāĻ˛ā§āϟāĻŋāĻ•">
-<!ENTITY font.langGroup.el "āĻ—ā§āϰāĻŋāĻ•">
-<!ENTITY font.langGroup.turkish "āϤ⧁āĻ°ā§āĻ•āĻŋ">
-<!ENTITY font.langGroup.unicode "āĻ…āĻ¨ā§āϝāĻžāĻ¨ā§āϝ āĻ­āĻžāώāĻž">
-<!ENTITY font.langGroup.user-def "āĻŦā§āϝāĻŦāĻšāĻžāϰāĻ•āĻžāϰ⧀ āύāĻŋāĻ°ā§āĻŦāĻžāϚāĻŋāϤ">
-<!ENTITY font.langGroup.thai "āĻĨāĻžāχ">
-<!ENTITY font.langGroup.hebrew "āĻšāĻŋāĻŦā§āϰ⧁">
-<!ENTITY font.langGroup.arabic "āφāϰāĻŦāĻŋ">
-<!ENTITY font.langGroup.devanagari "āĻĻ⧇āĻŦāύāĻ—āϰ⧀">
-<!ENTITY font.langGroup.tamil "āϤāĻžāĻŽāĻŋāϞ">
-<!ENTITY font.langGroup.armenian "āφāĻ°ā§āĻŽā§‡āύāĻŋ⧟āĻžāύ">
-<!ENTITY font.langGroup.bengali "āĻŦāĻžāĻ‚āϞāĻž">
-<!ENTITY font.langGroup.canadian "āχāωāύāĻŋāĻĢāĻžāχāĻĄ āĻ•ā§āϝāĻžāύ⧇āĻĄāĻŋ⧟āĻžāύ āϏāĻŋāϞ⧇āĻŦāĻžāϰāĻŋ">
-<!ENTITY font.langGroup.ethiopic "āχāĻĨāĻŋāĻ“āĻĒāĻŋāĻ•">
-<!ENTITY font.langGroup.georgian "āϜāĻ°ā§āϜāĻŋ⧟āĻžāύ">
-<!ENTITY font.langGroup.gujarati "āϗ⧁āϜāϰāĻžāϤāĻŋ">
-<!ENTITY font.langGroup.gurmukhi "āϗ⧁āϰ⧁āĻŽā§āĻ–āĻŋ">
-<!ENTITY font.langGroup.khmer "āϖ⧇āĻŽāĻžāϰ">
-<!ENTITY font.langGroup.malayalam "āĻŽāĻžāϞāĻžā§ŸāĻžāϞāĻžāĻŽ">
-<!ENTITY font.langGroup.oriya "āĻ“ā§œāĻŋ⧟āĻž">
-<!ENTITY font.langGroup.telugu "āϤ⧇āϞ⧁āϗ⧁">
-<!ENTITY font.langGroup.kannada "āĻ•āĻžāĻ¨ā§āύāĻžāĻĄāĻž">
-<!ENTITY font.langGroup.sinhala "āϏāĻŋāύāĻšāĻžāϞāĻž">
-<!ENTITY font.langGroup.tibetan "āϤāĻŋāĻŦā§āĻŦāĻ¤ā§€ā§Ÿ">
+<!ENTITY  font.langGroup.latin1                   "āĻĒāĻļā§āϚāĻŋāĻŽāĻŋ">
+<!ENTITY  font.langGroup.latin2                   "āĻŽāĻ§ā§āϝ āχāωāϰ⧋āĻĒāĻŋāϝāĻŧ">
+<!ENTITY  font.langGroup.japanese                 "āϜāĻžāĻĒāĻžāύāĻŋ">
+<!ENTITY  font.langGroup.trad-chinese             "āϏāύāĻžāϤāύ āĻšā§€āύāĻž (āϤāĻžāχāĻ“ā§ŸāĻžāύ)">
+<!ENTITY  font.langGroup.simpl-chinese            "āϏāϰāϞāĻ•ā§ƒāϤ āĻšā§€āύāĻž">
+<!ENTITY  font.langGroup.trad-chinese-hk          "āϏāύāĻžāϤāύ āĻšā§€āύāĻž (āĻšāĻ‚ āĻ•āĻ‚)">
+<!ENTITY  font.langGroup.korean                   "āϕ⧋āϰāĻŋ⧟āĻžāύ">
+<!ENTITY  font.langGroup.cyrillic                 "āϏāĻŋāϰāĻŋāϞāĻŋāĻ•">
+<!ENTITY  font.langGroup.baltic                   "āĻŦāĻžāĻ˛ā§āϟāĻŋāĻ•">
+<!ENTITY  font.langGroup.el                       "āĻ—ā§āϰāĻŋāĻ•">
+<!ENTITY  font.langGroup.turkish                  "āϤ⧁āĻ°ā§āĻ•āĻŋ">
+<!ENTITY  font.langGroup.unicode                  "āĻ…āĻ¨ā§āϝāĻžāĻ¨ā§āϝ āĻ­āĻžāώāĻž">
+<!ENTITY  font.langGroup.user-def                 "āĻŦā§āϝāĻŦāĻšāĻžāϰāĻ•āĻžāϰ⧀ āύāĻŋāĻ°ā§āĻŦāĻžāϚāĻŋāϤ">
+<!ENTITY  font.langGroup.thai                     "āĻĨāĻžāχ">
+<!ENTITY  font.langGroup.hebrew                   "āĻšāĻŋāĻŦā§āϰ⧁">
+<!ENTITY  font.langGroup.arabic                   "āφāϰāĻŦāĻŋ">
+<!ENTITY  font.langGroup.devanagari               "āĻĻ⧇āĻŦāύāĻ—āϰ⧀">
+<!ENTITY  font.langGroup.tamil                    "āϤāĻžāĻŽāĻŋāϞ">
+<!ENTITY  font.langGroup.armenian                 "āφāĻ°ā§āĻŽā§‡āύāĻŋ⧟āĻžāύ">
+<!ENTITY  font.langGroup.bengali                  "āĻŦāĻžāĻ‚āϞāĻž">
+<!ENTITY  font.langGroup.canadian                 "āχāωāύāĻŋāĻĢāĻžāχāĻĄ āĻ•ā§āϝāĻžāύ⧇āĻĄāĻŋ⧟āĻžāύ āϏāĻŋāϞ⧇āĻŦāĻžāϰāĻŋ">
+<!ENTITY  font.langGroup.ethiopic                 "āχāĻĨāĻŋāĻ“āĻĒāĻŋāĻ•">
+<!ENTITY  font.langGroup.georgian                 "āϜāĻ°ā§āϜāĻŋ⧟āĻžāύ">
+<!ENTITY  font.langGroup.gujarati                 "āϗ⧁āϜāϰāĻžāϤāĻŋ">
+<!ENTITY  font.langGroup.gurmukhi                 "āϗ⧁āϰ⧁āĻŽā§āĻ–āĻŋ">
+<!ENTITY  font.langGroup.khmer                    "āϖ⧇āĻŽāĻžāϰ">
+<!ENTITY  font.langGroup.malayalam                "āĻŽāĻžāϞāĻžā§ŸāĻžāϞāĻžāĻŽ">
+<!ENTITY  font.langGroup.oriya                    "āĻ“ā§œāĻŋ⧟āĻž">
+<!ENTITY  font.langGroup.telugu                   "āϤ⧇āϞ⧁āϗ⧁">
+<!ENTITY  font.langGroup.kannada                  "āĻ•āĻžāĻ¨ā§āύāĻžāĻĄāĻž">
+<!ENTITY  font.langGroup.sinhala                  "āϏāĻŋāύāĻšāĻžāϞāĻž">
+<!ENTITY  font.langGroup.tibetan                  "āϤāĻŋāĻŦā§āĻŦāĻ¤ā§€ā§Ÿ">
 <!-- Minimum font size -->
-<!ENTITY minSize.label "āĻĢāĻ¨ā§āĻŸā§‡āϰ āϏāĻ°ā§āĻŦāύāĻŋāĻŽā§āύ āĻŽāĻžāĻĒ (O):">
-<!ENTITY minSize.accesskey "O">
-<!ENTITY minSize.none "-">
+<!ENTITY minSize.label                            "āĻĢāĻ¨ā§āĻŸā§‡āϰ āϏāĻ°ā§āĻŦāύāĻŋāĻŽā§āύ āĻŽāĻžāĻĒ (O):">
+<!ENTITY minSize.accesskey                        "O">
+<!ENTITY minSize.none                             "-">
 <!-- default font type -->
 
-<!ENTITY useDefaultFontSerif.label "Serif">
-<!ENTITY useDefaultFontSansSerif.label "Sans Serif">
+<!ENTITY  useDefaultFontSerif.label               "Serif">
+<!ENTITY  useDefaultFontSansSerif.label           "Sans Serif">
 
-<!ENTITY allowPagesToUse.label "āωāĻĒāϰ⧇ āύāĻŋāĻ°ā§āĻŦāĻžāϚāĻŋāϤ āĻĢāĻ¨ā§āϟ āωāĻĒ⧇āĻ•ā§āώāĻž āĻ•āϰ⧇, āĻĒ⧃āĻˇā§āĻ āĻžāϗ⧁āϞ⧋ āύāĻŋāϜāĻ¸ā§āĻŦ āĻĢāĻ¨ā§āϟ āĻŦā§āϝāĻŦāĻšāĻžāϰ āĻ•āϰāϤ⧇ āĻĒāĻžāϰāĻŦ⧇ (A)">
-<!ENTITY allowPagesToUse.accesskey "A">
+<!ENTITY  allowPagesToUse.label                   "āωāĻĒāϰ⧇ āύāĻŋāĻ°ā§āĻŦāĻžāϚāĻŋāϤ āĻĢāĻ¨ā§āϟ āωāĻĒ⧇āĻ•ā§āώāĻž āĻ•āϰ⧇, āĻĒ⧃āĻˇā§āĻ āĻžāϗ⧁āϞ⧋ āύāĻŋāϜāĻ¸ā§āĻŦ āĻĢāĻ¨ā§āϟ āĻŦā§āϝāĻŦāĻšāĻžāϰ āĻ•āϰāϤ⧇ āĻĒāĻžāϰāĻŦ⧇ (A)">
+<!ENTITY  allowPagesToUse.accesskey               "A">
 
-<!ENTITY languages.customize.Charset.grouplabel "āĻ•ā§āϝāĻžāϰ⧇āĻ•ā§āϟāĻžāϰ āĻāύāϕ⧋āĻĄāĻŋāĻ‚">
-<!ENTITY languages.customize.DefaultCharset.label "āĻĄāĻŋāĻĢāĻ˛ā§āϟ āĻ•ā§āϝāĻžāϰ⧇āĻ•ā§āϟāĻžāϰ āĻāύāϕ⧋āĻĄāĻŋāĻ‚ (C):">
-<!ENTITY languages.customize.DefaultCharset.accesskey "C">
+<!ENTITY languages.customize.Charset.grouplabel         "āĻ•ā§āϝāĻžāϰ⧇āĻ•ā§āϟāĻžāϰ āĻāύāϕ⧋āĻĄāĻŋāĻ‚">
+<!ENTITY languages.customize.DefaultCharset.label       "āĻĄāĻŋāĻĢāĻ˛ā§āϟ āĻ•ā§āϝāĻžāϰ⧇āĻ•ā§āϟāĻžāϰ āĻāύāϕ⧋āĻĄāĻŋāĻ‚ (C):">
+<!ENTITY languages.customize.DefaultCharset.accesskey   "C">
--- a/browser/chrome/browser/preferences/languages.dtd
+++ b/browser/chrome/browser/preferences/languages.dtd
@@ -1,15 +1,15 @@
-<!ENTITY window.width "30em">
+<!ENTITY window.width                                   "30em">
 
-<!ENTITY languages.customize.Header "āĻ­āĻžāώāĻž">
-<!ENTITY languages.customize.prefLangDescript "āĻ…āύ⧇āĻ• āĻ•ā§āώ⧇āĻ¤ā§āϰ⧇ āĻ“ā§Ÿā§‡āĻŦāĻĒ⧇āϜāϗ⧁āϞāĻŋ āĻāĻ•āĻžāϧāĻŋāĻ• āĻ­āĻžāώāĻž āϏāĻŽāĻ°ā§āĻĨāύ āĻ•āϰ⧇āĨ¤ āφāĻĒāύāĻžāϰ āĻĒāĻ›āĻ¨ā§āĻĻ āĻ…āύ⧁āϏāĻžāϰ⧇, āĻ“ā§Ÿā§‡āĻŦāĻĒ⧇āϜ āĻĒā§āϰāĻĻāĻ°ā§āĻļāύ⧇āϰ āĻ­āĻžāώāĻž  āύāĻŋāĻ°ā§āĻŦāĻžāϚāύ āĻ•āϰ⧁āύāĨ¤">
-<!ENTITY languages.customize.active.label "āĻĒāĻ›āĻ¨ā§āĻĻ⧇āϰ āĻ•ā§āϰāĻŽāĻžāύ⧁āϝāĻžā§Ÿā§€ āĻ­āĻžāώāĻžāϰ āϤāĻžāϞāĻŋāĻ•āĻž:">
-<!ENTITY languages.customize.moveUp.label "āωāĻĒāϰ⧇ āωāĻ āĻžāύ⧋ (U)">
-<!ENTITY languages.customize.moveUp.accesskey "U">
-<!ENTITY languages.customize.moveDown.label "āύ⧀āĻšā§‡ āύāĻžāĻŽāĻžāύ⧋ (D)">
-<!ENTITY languages.customize.moveDown.accesskey "D">
-<!ENTITY languages.customize.deleteButton.label "āĻ…āĻĒāϏāĻžāϰāĻŖ (R)">
-<!ENTITY languages.customize.deleteButton.accesskey "R">
-<!ENTITY languages.customize.selectLanguage.label "āĻ­āĻžāώāĻž āϝ⧋āĻ—...">
-<!ENTITY languages.customize.addButton.label "āϝ⧋āĻ— (A)">
-<!ENTITY languages.customize.addButton.accesskey "A">
+<!ENTITY languages.customize.Header                     "āĻ­āĻžāώāĻž">
+<!ENTITY languages.customize.prefLangDescript           "āĻ…āύ⧇āĻ• āĻ•ā§āώ⧇āĻ¤ā§āϰ⧇ āĻ“ā§Ÿā§‡āĻŦāĻĒ⧇āϜāϗ⧁āϞāĻŋ āĻāĻ•āĻžāϧāĻŋāĻ• āĻ­āĻžāώāĻž āϏāĻŽāĻ°ā§āĻĨāύ āĻ•āϰ⧇āĨ¤ āφāĻĒāύāĻžāϰ āĻĒāĻ›āĻ¨ā§āĻĻ āĻ…āύ⧁āϏāĻžāϰ⧇, āĻ“ā§Ÿā§‡āĻŦāĻĒ⧇āϜ āĻĒā§āϰāĻĻāĻ°ā§āĻļāύ⧇āϰ āĻ­āĻžāώāĻž  āύāĻŋāĻ°ā§āĻŦāĻžāϚāύ āĻ•āϰ⧁āύāĨ¤">
+<!ENTITY languages.customize.active.label               "āĻĒāĻ›āĻ¨ā§āĻĻ⧇āϰ āĻ•ā§āϰāĻŽāĻžāύ⧁āϝāĻžā§Ÿā§€ āĻ­āĻžāώāĻžāϰ āϤāĻžāϞāĻŋāĻ•āĻž:">
+<!ENTITY languages.customize.moveUp.label               "āωāĻĒāϰ⧇ āωāĻ āĻžāύ⧋ (U)">
+<!ENTITY languages.customize.moveUp.accesskey           "U">
+<!ENTITY languages.customize.moveDown.label             "āύ⧀āĻšā§‡ āύāĻžāĻŽāĻžāύ⧋ (D)">
+<!ENTITY languages.customize.moveDown.accesskey         "D">
+<!ENTITY languages.customize.deleteButton.label         "āĻ…āĻĒāϏāĻžāϰāĻŖ (R)">
+<!ENTITY languages.customize.deleteButton.accesskey     "R">
+<!ENTITY languages.customize.selectLanguage.label       "āĻ­āĻžāώāĻž āϝ⧋āĻ—...">
+<!ENTITY languages.customize.addButton.label            "āϝ⧋āĻ— (A)">
+<!ENTITY languages.customize.addButton.accesskey        "A">
 
--- a/browser/chrome/browser/preferences/main.dtd
+++ b/browser/chrome/browser/preferences/main.dtd
@@ -1,37 +1,37 @@
-<!ENTITY startup.label "āφāϰāĻŽā§āĻ­">
+<!ENTITY startup.label             "āφāϰāĻŽā§āĻ­">
 
-<!ENTITY startupPage.label "&brandShortName; āφāϰāĻŽā§āϭ⧇āϰ āϏāĻŽā§Ÿ (s):">
-<!ENTITY startupPage.accesskey "s">
-<!ENTITY startupHomePage.label "āĻĒā§āϰāϧāĻžāύ āĻĒāĻžāϤāĻž āĻĒā§āϰāĻĻāĻ°ā§āĻļāύ āĻ•āϰāĻž āĻšāĻŦ⧇">
-<!ENTITY startupBlankPage.label "āĻĢāĻžāρāĻ•āĻž āĻĒ⧃āĻˇā§āĻ āĻž āĻĒā§āϰāĻĻāĻ°ā§āĻļāύ āĻ•āϰāĻž āĻšāĻŦ⧇">
-<!ENTITY startupLastSession.label "āϏāĻ°ā§āĻŦāĻļ⧇āώ āωāχāĻ¨ā§āĻĄā§‹ āĻ“ āĻŸā§āϝāĻžāĻŦ āĻĒā§āϰāĻĻāĻ°ā§āĻļāύ āĻ•āϰāĻž āĻšāĻŦ⧇">
-<!ENTITY homepage.label "āĻĒā§āϰāϧāĻžāύ āĻĒāĻžāϤāĻž: (P)">
-<!ENTITY homepage.accesskey "P">
-<!ENTITY useCurrentPage.label "āĻŦāĻ°ā§āϤāĻŽāĻžāύ āĻĒ⧃āĻˇā§āĻ āĻž āĻĒā§āĻ°ā§Ÿā§‹āĻ— āĻ•āϰāĻž āĻšāĻŦ⧇ (C)">
-<!ENTITY useCurrentPage.accesskey "C">
-<!ENTITY useMultiple.label "āĻŦāĻ°ā§āϤāĻŽāĻžāύ āĻĒ⧃āĻˇā§āĻ āĻžāϗ⧁āϞāĻŋ āĻĒā§āĻ°ā§Ÿā§‹āĻ— āĻ•āϰāĻž āĻšāĻŦ⧇">
-<!ENTITY useBookmark.label "āĻŦ⧁āĻ•āĻŽāĻžāĻ°ā§āĻ• āĻĒā§āĻ°ā§Ÿā§‹āĻ— āĻ•āϰāĻž āĻšāĻŦ⧇ (B)">
-<!ENTITY useBookmark.accesskey "B">
-<!ENTITY restoreDefault.label "āĻĄāĻŋāĻĢāĻ˛ā§āϟ āĻŽāĻžāύ āĻĒ⧁āύāσāĻ¸ā§āĻĨāĻžāĻĒāύ āĻ•āϰāĻž āĻšāĻŦ⧇ (R)">
-<!ENTITY restoreDefault.accesskey "R">
+<!ENTITY startupPage.label         "&brandShortName; āφāϰāĻŽā§āϭ⧇āϰ āϏāĻŽā§Ÿ (s):">
+<!ENTITY startupPage.accesskey     "s">
+<!ENTITY startupHomePage.label     "āĻĒā§āϰāϧāĻžāύ āĻĒāĻžāϤāĻž āĻĒā§āϰāĻĻāĻ°ā§āĻļāύ āĻ•āϰāĻž āĻšāĻŦ⧇">
+<!ENTITY startupBlankPage.label    "āĻĢāĻžāρāĻ•āĻž āĻĒ⧃āĻˇā§āĻ āĻž āĻĒā§āϰāĻĻāĻ°ā§āĻļāύ āĻ•āϰāĻž āĻšāĻŦ⧇">
+<!ENTITY startupLastSession.label  "āϏāĻ°ā§āĻŦāĻļ⧇āώ āωāχāĻ¨ā§āĻĄā§‹ āĻ“ āĻŸā§āϝāĻžāĻŦ āĻĒā§āϰāĻĻāĻ°ā§āĻļāύ āĻ•āϰāĻž āĻšāĻŦ⧇">
+<!ENTITY homepage.label            "āĻĒā§āϰāϧāĻžāύ āĻĒāĻžāϤāĻž: (P)">
+<!ENTITY homepage.accesskey        "P">
+<!ENTITY useCurrentPage.label      "āĻŦāĻ°ā§āϤāĻŽāĻžāύ āĻĒ⧃āĻˇā§āĻ āĻž āĻĒā§āĻ°ā§Ÿā§‹āĻ— āĻ•āϰāĻž āĻšāĻŦ⧇ (C)">
+<!ENTITY useCurrentPage.accesskey  "C">
+<!ENTITY useMultiple.label         "āĻŦāĻ°ā§āϤāĻŽāĻžāύ āĻĒ⧃āĻˇā§āĻ āĻžāϗ⧁āϞāĻŋ āĻĒā§āĻ°ā§Ÿā§‹āĻ— āĻ•āϰāĻž āĻšāĻŦ⧇">
+<!ENTITY useBookmark.label         "āĻŦ⧁āĻ•āĻŽāĻžāĻ°ā§āĻ• āĻĒā§āĻ°ā§Ÿā§‹āĻ— āĻ•āϰāĻž āĻšāĻŦ⧇ (B)">
+<!ENTITY useBookmark.accesskey     "B">
+<!ENTITY restoreDefault.label      "āĻĄāĻŋāĻĢāĻ˛ā§āϟ āĻŽāĻžāύ āĻĒ⧁āύāσāĻ¸ā§āĻĨāĻžāĻĒāύ āĻ•āϰāĻž āĻšāĻŦ⧇ (R)">
+<!ENTITY restoreDefault.accesskey  "R">
 
-<!ENTITY downloads.label "āĻĄāĻžāωāύāϞ⧋āĻĄ">
+<!ENTITY downloads.label     "āĻĄāĻžāωāύāϞ⧋āĻĄ">
 
-<!ENTITY showWhenDownloading.label "āĻĢāĻžāχāϞ āĻĄāĻžāωāύāϞ⧋āĻĄā§‡āϰ āϏāĻŽā§Ÿ āĻĄāĻžāωāύāϞ⧋āĻĄ āωāχāĻ¨ā§āĻĄā§‹ āĻĒā§āϰāĻĻāĻ°ā§āĻļāύ āĻ•āϰāĻž āĻšāĻŦ⧇ (D)">
+<!ENTITY showWhenDownloading.label     "āĻĢāĻžāχāϞ āĻĄāĻžāωāύāϞ⧋āĻĄā§‡āϰ āϏāĻŽā§Ÿ āĻĄāĻžāωāύāϞ⧋āĻĄ āωāχāĻ¨ā§āĻĄā§‹ āĻĒā§āϰāĻĻāĻ°ā§āĻļāύ āĻ•āϰāĻž āĻšāĻŦ⧇ (D)">
 <!ENTITY showWhenDownloading.accesskey "D">
 <!ENTITY closeWhenDone.label "āϏāĻŦ āĻĄāĻžāωāύāϞ⧋āĻĄ āϏāĻŽā§āĻĒāĻ¨ā§āύ āĻšāϞ⧇ āωāχāĻ¨ā§āĻĄā§‹āϟāĻŋ āĻŦāĻ¨ā§āϧ āĻ•āϰāĻž āĻšāĻŦ⧇ (w)">
 <!ENTITY closeWhenDone.accesskey "w">
 <!ENTITY saveTo.label "āĻĢāĻžāχāϞ āϏāĻ‚āϰāĻ•ā§āώāϪ⧇āϰ āĻ¸ā§āĻĨāĻžāύ (v)">
 <!ENTITY saveTo.accesskey "v">
-<!ENTITY chooseFolderWin.label "āĻŦā§āϰāĻžāωāϜ... (o)">
-<!ENTITY chooseFolderWin.accesskey "o">
-<!ENTITY chooseFolderMac.label "āύāĻŋāĻ°ā§āĻŦāĻžāϚāύ... (e)">
-<!ENTITY chooseFolderMac.accesskey "e">
+<!ENTITY chooseFolderWin.label        "āĻŦā§āϰāĻžāωāϜ... (o)">
+<!ENTITY chooseFolderWin.accesskey    "o">
+<!ENTITY chooseFolderMac.label        "āύāĻŋāĻ°ā§āĻŦāĻžāϚāύ... (e)">
+<!ENTITY chooseFolderMac.accesskey    "e">
 <!ENTITY alwaysAsk.label "āĻĢāĻžāχāϞ āϏāĻ‚āϰāĻ•ā§āώāϪ⧇āϰ āĻ¸ā§āĻĨāĻžāύ āϏāĻŦāϏāĻŽā§Ÿ āϜāĻŋāĻœā§āĻžā§‡āϏ āĻ•āϰāĻž āĻšāĻŦ⧇ (A)">
 <!ENTITY alwaysAsk.accesskey "A">
 
-<!ENTITY addonsMgr.label "āĻ…ā§āϝāĻžāĻĄ-āĻ…āύ">
-<!ENTITY manageAddonsDescWin.label "āφāĻĒāύāĻžāϰ āĻ…ā§āϝāĻžāĻĄ-āĻ…āύ⧇āϰ āĻ…āĻĒāĻļāύ āĻĒāϰāĻŋāĻŦāĻ°ā§āϤāύ āĻ•āϰ⧁āύ">
-<!ENTITY manageAddonsDescUnix2.label "āφāĻĒāύāĻžāϰ āĻ…ā§āϝāĻžāĻĄ-āĻ…āύ⧇āϰ āĻĒāĻ›āĻ¨ā§āĻĻāϏāĻŽā§‚āĻš āĻĒāϰāĻŋāĻŦāĻ°ā§āϤāύ āĻ•āϰ⧁āύ">
-<!ENTITY manageAddons.label "āĻ…ā§āϝāĻžāĻĄ-āĻ…āύ āĻŦā§āϝāĻŦāĻ¸ā§āĻĨāĻžāĻĒāύāĻžâ€Ļ (M)">
-<!ENTITY manageAddons.accesskey "M">
+<!ENTITY addonsMgr.label               "āĻ…ā§āϝāĻžāĻĄ-āĻ…āύ">
+<!ENTITY manageAddonsDescWin.label     "āφāĻĒāύāĻžāϰ āĻ…ā§āϝāĻžāĻĄ-āĻ…āύ⧇āϰ āĻ…āĻĒāĻļāύ āĻĒāϰāĻŋāĻŦāĻ°ā§āϤāύ āĻ•āϰ⧁āύ">
+<!ENTITY manageAddonsDescUnix2.label   "āφāĻĒāύāĻžāϰ āĻ…ā§āϝāĻžāĻĄ-āĻ…āύ⧇āϰ āĻĒāĻ›āĻ¨ā§āĻĻāϏāĻŽā§‚āĻš āĻĒāϰāĻŋāĻŦāĻ°ā§āϤāύ āĻ•āϰ⧁āύ">
+<!ENTITY manageAddons.label            "āĻ…ā§āϝāĻžāĻĄ-āĻ…āύ āĻŦā§āϝāĻŦāĻ¸ā§āĻĨāĻžāĻĒāύāĻžâ€Ļ (M)">
+<!ENTITY manageAddons.accesskey        "M">
--- a/browser/chrome/browser/preferences/permissions.dtd
+++ b/browser/chrome/browser/preferences/permissions.dtd
@@ -1,22 +1,22 @@
-<!ENTITY window.title "āĻŦā§āϝāϤāĻŋāĻ•ā§āϰāĻŽ">
-<!ENTITY window.width "36em">
+<!ENTITY window.title                 "āĻŦā§āϝāϤāĻŋāĻ•ā§āϰāĻŽ">
+<!ENTITY window.width                 "36em">
 
-<!ENTITY treehead.sitename.label "āϏāĻžāχāϟ">
-<!ENTITY treehead.status.label "āĻ…āĻŦāĻ¸ā§āĻĨāĻž">
-<!ENTITY removepermission.label "āϏāĻžāχāϟ āĻ…āĻĒāϏāĻžāϰāĻŖ (R)">
-<!ENTITY removepermission.accesskey "R">
-<!ENTITY removeallpermissions.label "āϏāĻŦ āϏāĻžāχāϟ āĻ…āĻĒāϏāĻžāϰāĻŖ (E)">
+<!ENTITY treehead.sitename.label      "āϏāĻžāχāϟ">
+<!ENTITY treehead.status.label        "āĻ…āĻŦāĻ¸ā§āĻĨāĻž">
+<!ENTITY removepermission.label       "āϏāĻžāχāϟ āĻ…āĻĒāϏāĻžāϰāĻŖ (R)">
+<!ENTITY removepermission.accesskey   "R">
+<!ENTITY removeallpermissions.label   "āϏāĻŦ āϏāĻžāχāϟ āĻ…āĻĒāϏāĻžāϰāĻŖ (E)">
 <!ENTITY removeallpermissions.accesskey "E">
-<!ENTITY address.label "āĻ“ā§Ÿā§‡āĻŦāϏāĻžāχāĻŸā§‡āϰ āĻ āĻŋāĻ•āĻžāύāĻž (D):">
-<!ENTITY address.accesskey "D">
-<!ENTITY block.label "āĻĒā§āϰāϤāĻŋāϰ⧋āϧ āĻ•āϰāĻž āĻšāĻŦ⧇ (B)">
-<!ENTITY block.accesskey "B">
-<!ENTITY session.label "āϏ⧇āĻļāύ⧇āϰ āϜāĻ¨ā§āϝ āĻ…āύ⧁āĻŽā§‹āĻĻāύ āĻ•āϰāĻž āĻšāĻŦ⧇ (S)">
-<!ENTITY session.accesskey "S">
-<!ENTITY allow.label "āĻ…āύ⧁āĻŽā§‹āĻĻāύ (A)">
-<!ENTITY allow.accesskey "A">
-<!ENTITY windowClose.key "w">
+<!ENTITY address.label                "āĻ“ā§Ÿā§‡āĻŦāϏāĻžāχāĻŸā§‡āϰ āĻ āĻŋāĻ•āĻžāύāĻž (D):">
+<!ENTITY address.accesskey            "D">
+<!ENTITY block.label                  "āĻĒā§āϰāϤāĻŋāϰ⧋āϧ āĻ•āϰāĻž āĻšāĻŦ⧇ (B)">
+<!ENTITY block.accesskey              "B">
+<!ENTITY session.label                "āϏ⧇āĻļāύ⧇āϰ āϜāĻ¨ā§āϝ āĻ…āύ⧁āĻŽā§‹āĻĻāύ āĻ•āϰāĻž āĻšāĻŦ⧇ (S)">
+<!ENTITY session.accesskey            "S">
+<!ENTITY allow.label                  "āĻ…āύ⧁āĻŽā§‹āĻĻāύ (A)">
+<!ENTITY allow.accesskey              "A">
+<!ENTITY windowClose.key              "w">
 
-<!ENTITY button.close.label "āĻŦāĻ¨ā§āϧ (C)">
-<!ENTITY button.close.accesskey "C">
+<!ENTITY button.close.label           "āĻŦāĻ¨ā§āϧ (C)">
+<!ENTITY button.close.accesskey       "C">
 
--- a/browser/chrome/browser/preferences/preferences.dtd
+++ b/browser/chrome/browser/preferences/preferences.dtd
@@ -1,19 +1,19 @@
 
-<!ENTITY prefWindow.titleWin "āĻ…āĻĒāĻļāύ">
-<!ENTITY prefWindow.titleGNOME "&brandShortName; āĻĒāĻ›āĻ¨ā§āĻĻāϏāĻŽā§‚āĻš">
+<!ENTITY  prefWindow.titleWin     "āĻ…āĻĒāĻļāύ">
+<!ENTITY  prefWindow.titleGNOME   "&brandShortName; āĻĒāĻ›āĻ¨ā§āĻĻāϏāĻŽā§‚āĻš">
 <!-- When making changes to prefWindow.styleWin test both Windows Classic and
      Luna since widget heights are different based on the OS theme -->
-<!ENTITY prefWinMinSize.styleWin2 "width: 50em; min-height: 45em;">
-<!ENTITY prefWinMinSize.styleMac "width: 50em; min-height: 45em;">
-<!ENTITY prefWinMinSize.styleGNOME "width: 50em; min-height: 45em;">
+<!ENTITY  prefWinMinSize.styleWin2      "width: 50em; min-height: 45em;">
+<!ENTITY  prefWinMinSize.styleMac       "width: 50em; min-height: 45em;">
+<!ENTITY  prefWinMinSize.styleGNOME     "width: 50em; min-height: 45em;">
 
-<!ENTITY paneGeneral.title "āϏāĻžāϧāĻžāϰāĻŖ">
-<!ENTITY paneTabs.title "āĻŸā§āϝāĻžāĻŦ">
-<!ENTITY paneContent.title "āĻŦāĻŋāώ⧟āĻŦāĻ¸ā§āϤ⧁">
-<!ENTITY paneApplications.title "āĻ…ā§āϝāĻžāĻĒā§āϞāĻŋāϕ⧇āĻļāύ">
-<!ENTITY panePrivacy.title "āĻ—ā§‹āĻĒāĻ¨ā§€ā§ŸāϤāĻž">
-<!ENTITY paneSecurity.title "āύāĻŋāϰāĻžāĻĒāĻ¤ā§āϤāĻž">
-<!ENTITY paneAdvanced.title "āωāĻšā§āϚāĻĒāĻ°ā§āϝāĻžā§Ÿā§‡āϰ āĻŦ⧈āĻļāĻŋāĻˇā§āĻŸā§āϝ">
+<!ENTITY  paneGeneral.title       "āϏāĻžāϧāĻžāϰāĻŖ">
+<!ENTITY  paneTabs.title          "āĻŸā§āϝāĻžāĻŦ">
+<!ENTITY  paneContent.title       "āĻŦāĻŋāώ⧟āĻŦāĻ¸ā§āϤ⧁">
+<!ENTITY  paneApplications.title  "āĻ…ā§āϝāĻžāĻĒā§āϞāĻŋāϕ⧇āĻļāύ">
+<!ENTITY  panePrivacy.title       "āĻ—ā§‹āĻĒāĻ¨ā§€ā§ŸāϤāĻž">
+<!ENTITY  paneSecurity.title      "āύāĻŋāϰāĻžāĻĒāĻ¤ā§āϤāĻž">
+<!ENTITY  paneAdvanced.title      "āωāĻšā§āϚāĻĒāĻ°ā§āϝāĻžā§Ÿā§‡āϰ āĻŦ⧈āĻļāĻŋāĻˇā§āĻŸā§āϝ">
 <!-- LOCALIZATION NOTE (paneSync.title): This should match syncBrand.shortName.label in ../syncBrand.dtd -->
 
-<!ENTITY paneSync.title "āϏāĻŋāĻ™ā§āĻ•">
+<!ENTITY  paneSync.title          "āϏāĻŋāĻ™ā§āĻ•">
--- a/browser/chrome/browser/preferences/privacy.dtd
+++ b/browser/chrome/browser/preferences/privacy.dtd
@@ -1,80 +1,80 @@
-<!ENTITY tracking.label "āĻŸā§āĻ°ā§āϝāĻžāĻ•āĻŋāĻ‚">
+<!ENTITY tracking.label                 "āĻŸā§āĻ°ā§āϝāĻžāĻ•āĻŋāĻ‚">
 
-<!ENTITY doNotTrack.label "āĻ“ā§Ÿā§‡āĻŦ āϏāĻžāχāϟāϟāĻŋ āĻŸā§āĻ°ā§āϝāĻžāĻ• āĻ•āϰāĻž āĻšāĻŦ⧇ āύāĻž">
-<!ENTITY doNotTrack.accesskey "d">
+<!ENTITY doNotTrack.label               "āĻ“ā§Ÿā§‡āĻŦ āϏāĻžāχāϟāϟāĻŋ āĻŸā§āĻ°ā§āϝāĻžāĻ• āĻ•āϰāĻž āĻšāĻŦ⧇ āύāĻž">
+<!ENTITY doNotTrack.accesskey           "d">
 
-<!ENTITY history.label "āχāϤāĻŋāĻšāĻžāϏ">
+<!ENTITY  history.label                 "āχāϤāĻŋāĻšāĻžāϏ">
 
-<!ENTITY locationBar.label "āĻ āĻŋāĻ•āĻžāύāĻž āĻŦāĻžāϰ">
+<!ENTITY  locationBar.label             "āĻ āĻŋāĻ•āĻžāύāĻž āĻŦāĻžāϰ">
 
-<!ENTITY locbar.pre.label "āĻ āĻŋāĻ•āĻžāύāĻž āĻŦāĻžāϰ āĻŦā§āϝāĻŦāĻšāĻžāϰ āĻ•āϰāĻžāϰ āϏāĻŽā§Ÿ āĻĒāϰāĻžāĻŽāĻ°ā§āĻļ⧇ āĻ…āĻ¨ā§āϤāĻ°ā§āϭ⧁āĻ•ā§āϤ āĻĨāĻžāĻ•āĻŦ⧇: (u)">
-<!ENTITY locbar.pre.accessKey "u">
-<!ENTITY locbar.post.label "">
-<!ENTITY locbar.both.label "āχāϤāĻŋāĻšāĻžāϏ āĻ“ āĻŦ⧁āĻ•āĻŽāĻžāĻ°ā§āĻ•">
-<!ENTITY locbar.history.label "āχāϤāĻŋāĻšāĻžāϏ">
-<!ENTITY locbar.bookmarks.label "āĻŦ⧁āĻ•āĻŽāĻžāĻ°ā§āĻ•">
-<!ENTITY locbar.nothing.label "āĻ•āĻŋāϛ⧁āχ āύāĻž">
+<!ENTITY  locbar.pre.label              "āĻ āĻŋāĻ•āĻžāύāĻž āĻŦāĻžāϰ āĻŦā§āϝāĻŦāĻšāĻžāϰ āĻ•āϰāĻžāϰ āϏāĻŽā§Ÿ āĻĒāϰāĻžāĻŽāĻ°ā§āĻļ⧇ āĻ…āĻ¨ā§āϤāĻ°ā§āϭ⧁āĻ•ā§āϤ āĻĨāĻžāĻ•āĻŦ⧇: (u)">
+<!ENTITY  locbar.pre.accessKey          "u">
+<!ENTITY  locbar.post.label             "">
+<!ENTITY  locbar.both.label             "āχāϤāĻŋāĻšāĻžāϏ āĻ“ āĻŦ⧁āĻ•āĻŽāĻžāĻ°ā§āĻ•">
+<!ENTITY  locbar.history.label          "āχāϤāĻŋāĻšāĻžāϏ">
+<!ENTITY  locbar.bookmarks.label        "āĻŦ⧁āĻ•āĻŽāĻžāĻ°ā§āĻ•">
+<!ENTITY  locbar.nothing.label          "āĻ•āĻŋāϛ⧁āχ āύāĻž">
 
 
-<!ENTITY acceptCookies.label "āϝ⧇ āϏāĻžāχāϟ āĻĨ⧇āϕ⧇ āϕ⧁āĻ•āĻŋ āĻ—ā§āϰāĻšāĻŖ āĻ•āϰāĻž āĻšāĻŦ⧇ (A)">
-<!ENTITY acceptCookies.accesskey "A">
+<!ENTITY  acceptCookies.label           "āϝ⧇ āϏāĻžāχāϟ āĻĨ⧇āϕ⧇ āϕ⧁āĻ•āĻŋ āĻ—ā§āϰāĻšāĻŖ āĻ•āϰāĻž āĻšāĻŦ⧇ (A)">
+<!ENTITY  acceptCookies.accesskey       "A">
 
-<!ENTITY acceptThirdParty.label "āϤ⧃āĻ¤ā§€ā§Ÿ-āĻĒāĻ•ā§āώ⧇āϰ āϕ⧁āĻ•āĻŋ āĻ—ā§āϰāĻšāĻŖ āĻ•āϰāĻž āĻšāĻŦ⧇ (c)">
-<!ENTITY acceptThirdParty.accesskey "c">
+<!ENTITY  acceptThirdParty.label        "āϤ⧃āĻ¤ā§€ā§Ÿ-āĻĒāĻ•ā§āώ⧇āϰ āϕ⧁āĻ•āĻŋ āĻ—ā§āϰāĻšāĻŖ āĻ•āϰāĻž āĻšāĻŦ⧇ (c)">
+<!ENTITY  acceptThirdParty.accesskey    "c">
 
-<!ENTITY keepUntil.label "āϏāĻ‚āϰāĻ•ā§āώāϪ⧇āϰ āϏāĻŽā§ŸāĻ•āĻžāϞ: (K)">
-<!ENTITY keepUntil.accesskey "K">
+<!ENTITY  keepUntil.label               "āϏāĻ‚āϰāĻ•ā§āώāϪ⧇āϰ āϏāĻŽā§ŸāĻ•āĻžāϞ: (K)">
+<!ENTITY  keepUntil.accesskey           "K">
 
-<!ENTITY expire.label "āĻŽā§‡ā§ŸāĻžāĻĻ āωāĻ¤ā§āϤ⧀āĻ°ā§āĻŖ āĻšāĻ“ā§ŸāĻž āĻĒāĻ°ā§āϝāĻ¨ā§āϤ">
-<!ENTITY close.label "&brandShortName; āĻŦāĻ¨ā§āϧ āĻ•āϰāĻž āĻĒāĻ°ā§āϝāĻ¨ā§āϤ">
-<!ENTITY askEachTime.label "āĻĒā§āϰāϤāĻŋāĻŦāĻžāϰ āϜāĻŋāĻœā§āĻžā§‡āϏ āĻ•āϰāĻž āĻšāĻŦ⧇">
+<!ENTITY  expire.label                  "āĻŽā§‡ā§ŸāĻžāĻĻ āωāĻ¤ā§āϤ⧀āĻ°ā§āĻŖ āĻšāĻ“ā§ŸāĻž āĻĒāĻ°ā§āϝāĻ¨ā§āϤ">
+<!ENTITY  close.label                   "&brandShortName; āĻŦāĻ¨ā§āϧ āĻ•āϰāĻž āĻĒāĻ°ā§āϝāĻ¨ā§āϤ">
+<!ENTITY  askEachTime.label             "āĻĒā§āϰāϤāĻŋāĻŦāĻžāϰ āϜāĻŋāĻœā§āĻžā§‡āϏ āĻ•āϰāĻž āĻšāĻŦ⧇">
 
-<!ENTITY cookieExceptions.label "āĻŦā§āϝāϤāĻŋāĻ•ā§āϰāĻŽâ€Ļ (E)">
-<!ENTITY cookieExceptions.accesskey "E">
+<!ENTITY  cookieExceptions.label        "āĻŦā§āϝāϤāĻŋāĻ•ā§āϰāĻŽâ€Ļ (E)">
+<!ENTITY  cookieExceptions.accesskey    "E">
 
-<!ENTITY showCookies.label "āϕ⧁āĻ•āĻŋ āĻĒā§āϰāĻĻāĻ°ā§āĻļāύ... (S)">
-<!ENTITY showCookies.accesskey "S">
+<!ENTITY  showCookies.label             "āϕ⧁āĻ•āĻŋ āĻĒā§āϰāĻĻāĻ°ā§āĻļāύ... (S)">
+<!ENTITY  showCookies.accesskey         "S">
 
-<!ENTITY historyHeader.pre.label "&brandShortName; āĻšāĻŦ⧇: (w)">
-<!ENTITY historyHeader.pre.accesskey "w">
-<!ENTITY historyHeader.remember.label "āχāϤāĻŋāĻšāĻžāϏ āĻŽāύ⧇ āϰāĻžāĻ–āĻŦ⧇">
-<!ENTITY historyHeader.dontremember.label "āĻ•āĻ–āύ⧋āχ āχāϤāĻŋāĻšāĻžāϏ āĻŽāύ⧇ āϰāĻžāĻ–āĻŦ⧇ āύāĻž">
-<!ENTITY historyHeader.custom.label "āχāϤāĻŋāĻšāĻžāϏ⧇āϰ āϜāĻ¨ā§āϝ āĻ¸ā§āĻŦāύāĻŋāĻ°ā§āĻŦāĻžāϚāĻŋāϤ āϏ⧇āϟāĻŋāĻ‚ āĻŦā§āϝāĻŦāĻšāĻžāϰ āĻ•āϰāĻŦ⧇">
-<!ENTITY historyHeader.post.label "">
+<!ENTITY  historyHeader.pre.label          "&brandShortName; āĻšāĻŦ⧇: (w)">
+<!ENTITY  historyHeader.pre.accesskey      "w">
+<!ENTITY  historyHeader.remember.label     "āχāϤāĻŋāĻšāĻžāϏ āĻŽāύ⧇ āϰāĻžāĻ–āĻŦ⧇">
+<!ENTITY  historyHeader.dontremember.label "āĻ•āĻ–āύ⧋āχ āχāϤāĻŋāĻšāĻžāϏ āĻŽāύ⧇ āϰāĻžāĻ–āĻŦ⧇ āύāĻž">
+<!ENTITY  historyHeader.custom.label       "āχāϤāĻŋāĻšāĻžāϏ⧇āϰ āϜāĻ¨ā§āϝ āĻ¸ā§āĻŦāύāĻŋāĻ°ā§āĻŦāĻžāϚāĻŋāϤ āϏ⧇āϟāĻŋāĻ‚ āĻŦā§āϝāĻŦāĻšāĻžāϰ āĻ•āϰāĻŦ⧇">
+<!ENTITY  historyHeader.post.label         "">
 
-<!ENTITY rememberDescription.label "&brandShortName; āφāĻĒāύāĻžāϰ āĻŦā§āϰāĻžāωāϜāĻŋāĻ‚, āĻĄāĻžāωāύāϞ⧋āĻĄ, āĻĢāϰāĻŽ āĻāĻŦāĻ‚ āĻ…āύ⧁āϏāĻ¨ā§āϧāĻžāύ⧇āϰ āχāϤāĻŋāĻšāĻžāϏ āĻŽāύ⧇ āϰāĻžāĻ–āĻŦ⧇ āĻāĻŦāĻ‚ āĻĒāϰāĻŋāĻĻāĻ°ā§āĻļāĻŋāϤ āĻ“ā§Ÿā§‡āĻŦāϏāĻžāχāĻŸā§‡āϰ āϕ⧁āĻ•āĻŋ āϏāĻ‚āϰāĻ•ā§āώāĻŖ āĻ•āϰāĻŦ⧇āĨ¤">
+<!ENTITY  rememberDescription.label      "&brandShortName; āφāĻĒāύāĻžāϰ āĻŦā§āϰāĻžāωāϜāĻŋāĻ‚, āĻĄāĻžāωāύāϞ⧋āĻĄ, āĻĢāϰāĻŽ āĻāĻŦāĻ‚ āĻ…āύ⧁āϏāĻ¨ā§āϧāĻžāύ⧇āϰ āχāϤāĻŋāĻšāĻžāϏ āĻŽāύ⧇ āϰāĻžāĻ–āĻŦ⧇ āĻāĻŦāĻ‚ āĻĒāϰāĻŋāĻĻāĻ°ā§āĻļāĻŋāϤ āĻ“ā§Ÿā§‡āĻŦāϏāĻžāχāĻŸā§‡āϰ āϕ⧁āĻ•āĻŋ āϏāĻ‚āϰāĻ•ā§āώāĻŖ āĻ•āϰāĻŦ⧇āĨ¤">
 <!-- LOCALIZATION NOTE (rememberActions.pre.label): include a trailing space as needed -->
 <!-- LOCALIZATION NOTE (rememberActions.middle.label): include a starting and trailing space as needed -->
 <!-- LOCALIZATION NOTE (rememberActions.post.label): include a starting space as needed -->
 
-<!ENTITY rememberActions.pre.label "āφāĻĒāύāĻŋ āĻĒā§āĻ°ā§Ÿā§‹āϜāύ⧇ ">
-<!ENTITY rememberActions.clearHistory.label "āφāĻĒāύāĻžāϰ āϏāĻžāĻŽā§āĻĒā§āϰāϤāĻŋāĻ• āχāϤāĻŋāĻšāĻžāϏ āĻŽā§āϛ⧇ āĻĢ⧇āϞāϤ⧇">
-<!ENTITY rememberActions.middle.label ", āĻŦāĻž ">
-<!ENTITY rememberActions.removeCookies.label "āϕ⧁āĻ•āĻŋāϗ⧁āϞ⧋ āĻĒ⧃āĻĨāĻ•āĻ­āĻžāĻŦ⧇ āĻ…āĻĒāϏāĻžāϰāĻŖ āĻ•āϰāϤ⧇ āĻĒāĻžāϰ⧇āύ">
-<!ENTITY rememberActions.post.label ".">
+<!ENTITY  rememberActions.pre.label           "āφāĻĒāύāĻŋ āĻĒā§āĻ°ā§Ÿā§‹āϜāύ⧇ ">
+<!ENTITY  rememberActions.clearHistory.label  "āφāĻĒāύāĻžāϰ āϏāĻžāĻŽā§āĻĒā§āϰāϤāĻŋāĻ• āχāϤāĻŋāĻšāĻžāϏ āĻŽā§āϛ⧇ āĻĢ⧇āϞāϤ⧇">
+<!ENTITY  rememberActions.middle.label        ", āĻŦāĻž ">
+<!ENTITY  rememberActions.removeCookies.label "āϕ⧁āĻ•āĻŋāϗ⧁āϞ⧋ āĻĒ⧃āĻĨāĻ•āĻ­āĻžāĻŦ⧇ āĻ…āĻĒāϏāĻžāϰāĻŖ āĻ•āϰāϤ⧇ āĻĒāĻžāϰ⧇āύ">
+<!ENTITY  rememberActions.post.label          ".">
 
-<!ENTITY dontrememberDescription.label "&brandShortName; āĻāĻ•āĻžāĻ¨ā§āϤ āĻŦā§āϰāĻžāωāϜāĻŋāĻ‚ āĻāϰ āĻŽāϤ⧋āχ āϏ⧇āϟāĻŋāĻ‚ āĻŦā§āϝāĻŦāĻšāĻžāϰ āĻ•āϰāĻŦ⧇, āĻāĻŦāĻ‚ āφāĻĒāύāĻžāϰ āĻŦā§āϰāĻžāωāϜāĻŋāĻ‚ āĻāϰ āϕ⧋āύ āϤāĻĨā§āϝ āϏāĻ‚āϰāĻ•ā§āώāĻŖ āĻ•āϰāĻŦ⧇ āύāĻžāĨ¤">
+<!ENTITY  dontrememberDescription.label  "&brandShortName; āĻāĻ•āĻžāĻ¨ā§āϤ āĻŦā§āϰāĻžāωāϜāĻŋāĻ‚ āĻāϰ āĻŽāϤ⧋āχ āϏ⧇āϟāĻŋāĻ‚ āĻŦā§āϝāĻŦāĻšāĻžāϰ āĻ•āϰāĻŦ⧇, āĻāĻŦāĻ‚ āφāĻĒāύāĻžāϰ āĻŦā§āϰāĻžāωāϜāĻŋāĻ‚ āĻāϰ āϕ⧋āύ āϤāĻĨā§āϝ āϏāĻ‚āϰāĻ•ā§āώāĻŖ āĻ•āϰāĻŦ⧇ āύāĻžāĨ¤">
 <!-- LOCALIZATION NOTE (dontrememberActions.pre.label): include a trailing space as needed -->
 <!-- LOCALIZATION NOTE (dontrememberActions.post.label): include a starting space as needed -->
 
-<!ENTITY dontrememberActions.pre.label "āφāĻĒāύāĻŋ āϚāĻžāχāϞ⧇ ">
-<!ENTITY dontrememberActions.clearHistory.label "āĻŦāĻ°ā§āϤāĻŽāĻžāύ āϏāĻŦ āχāϤāĻŋāĻšāĻžāϏ āĻŽā§āϛ⧇ āĻĢ⧇āϞāĻž āĻšāĻŦ⧇">
-<!ENTITY dontrememberActions.post.label ".">
+<!ENTITY  dontrememberActions.pre.label          "āφāĻĒāύāĻŋ āϚāĻžāχāϞ⧇ ">
+<!ENTITY  dontrememberActions.clearHistory.label "āĻŦāĻ°ā§āϤāĻŽāĻžāύ āϏāĻŦ āχāϤāĻŋāĻšāĻžāϏ āĻŽā§āϛ⧇ āĻĢ⧇āϞāĻž āĻšāĻŦ⧇">
+<!ENTITY  dontrememberActions.post.label         ".">
 
-<!ENTITY privateBrowsingPermanent.label "āĻ¸ā§āĻĨāĻžā§Ÿā§€ āĻŦā§āϝāĻ•ā§āϤāĻŋāĻ—āϤ āĻŦā§āϰāĻžāωāϜāĻŋāĻ‚ āĻŽā§‹āĻĄ (P)">
-<!ENTITY privateBrowsingPermanent.accesskey "P">
+<!ENTITY  privateBrowsingPermanent.label "āĻ¸ā§āĻĨāĻžā§Ÿā§€ āĻŦā§āϝāĻ•ā§āϤāĻŋāĻ—āϤ āĻŦā§āϰāĻžāωāϜāĻŋāĻ‚ āĻŽā§‹āĻĄ (P)">
+<!ENTITY  privateBrowsingPermanent.accesskey "P">
 
-<!ENTITY rememberHistory.label "āφāĻŽāĻžāϰ āĻŦā§āϰāĻžāωāϜāĻŋāĻ‚ āĻāϰ āχāϤāĻŋāĻšāĻžāϏ āĻŽāύ⧇ āϰāĻžāϖ⧁āύ (b)">
-<!ENTITY rememberHistory.accesskey "b">
+<!ENTITY  rememberHistory.label      "āφāĻŽāĻžāϰ āĻŦā§āϰāĻžāωāϜāĻŋāĻ‚ āĻāϰ āχāϤāĻŋāĻšāĻžāϏ āĻŽāύ⧇ āϰāĻžāϖ⧁āύ (b)">
+<!ENTITY  rememberHistory.accesskey  "b">
 
-<!ENTITY rememberDownload.label "āĻĄāĻžāωāύāϞ⧋āĻĄ āχāϤāĻŋāĻšāĻžāϏ āĻŽāύ⧇ āϰāĻžāĻ–āĻž āĻšāĻŦ⧇ (d)">
-<!ENTITY rememberDownload.accesskey "d">
+<!ENTITY  rememberDownload.label         "āĻĄāĻžāωāύāϞ⧋āĻĄ āχāϤāĻŋāĻšāĻžāϏ āĻŽāύ⧇ āϰāĻžāĻ–āĻž āĻšāĻŦ⧇ (d)">
+<!ENTITY  rememberDownload.accesskey     "d">
 
-<!ENTITY rememberSearchForm.label "āĻ…āύ⧁āϏāĻ¨ā§āϧāĻžāύ āĻ“ āĻĢāϰāĻŽā§‡āϰ āχāϤāĻŋāĻšāĻžāϏ āĻŽāύ⧇ āϰāĻžāĻ–āĻž āĻšāĻŦ⧇ (f)">
-<!ENTITY rememberSearchForm.accesskey "f">
+<!ENTITY  rememberSearchForm.label       "āĻ…āύ⧁āϏāĻ¨ā§āϧāĻžāύ āĻ“ āĻĢāϰāĻŽā§‡āϰ āχāϤāĻŋāĻšāĻžāϏ āĻŽāύ⧇ āϰāĻžāĻ–āĻž āĻšāĻŦ⧇ (f)">
+<!ENTITY  rememberSearchForm.accesskey   "f">
 
-<!ENTITY clearOnClose.label "&brandShortName; āĻŦāĻ¨ā§āϧ āĻ•āϰāĻžāϰ āϏāĻŽā§Ÿ āχāϤāĻŋāĻšāĻžāϏ āĻŽā§āϛ⧇ āĻĢ⧇āϞāĻž āĻšāĻŦ⧇ (r)">
-<!ENTITY clearOnClose.accesskey "r">
+<!ENTITY  clearOnClose.label             "&brandShortName; āĻŦāĻ¨ā§āϧ āĻ•āϰāĻžāϰ āϏāĻŽā§Ÿ āχāϤāĻŋāĻšāĻžāϏ āĻŽā§āϛ⧇ āĻĢ⧇āϞāĻž āĻšāĻŦ⧇ (r)">
+<!ENTITY  clearOnClose.accesskey         "r">
 
-<!ENTITY clearOnCloseSettings.label "āϏ⧇āϟāĻŋāĻ‚â€Ļ (t)">
-<!ENTITY clearOnCloseSettings.accesskey "t">
+<!ENTITY  clearOnCloseSettings.label     "āϏ⧇āϟāĻŋāĻ‚â€Ļ (t)">
+<!ENTITY  clearOnCloseSettings.accesskey "t">
--- a/browser/chrome/browser/preferences/security.dtd
+++ b/browser/chrome/browser/preferences/security.dtd
@@ -1,34 +1,34 @@
-<!ENTITY warnAddonInstall.label "āϕ⧋āύ āϏāĻžāχāϟ āĻ…ā§āϝāĻžāĻĄ-āĻ…āύ āχāύāĻ¸ā§āϟāϞ āĻ•āϰāĻžāϰ āĻšā§‡āĻˇā§āϟāĻž āĻ•āϰāϞ⧇ āϏāϤāĻ°ā§āĻ• āĻ•āϰāĻž āĻšāĻŦ⧇ (W)">
-<!ENTITY warnAddonInstall.accesskey "W">
+<!ENTITY  warnAddonInstall.label        "āϕ⧋āύ āϏāĻžāχāϟ āĻ…ā§āϝāĻžāĻĄ-āĻ…āύ āχāύāĻ¸ā§āϟāϞ āĻ•āϰāĻžāϰ āĻšā§‡āĻˇā§āϟāĻž āĻ•āϰāϞ⧇ āϏāϤāĻ°ā§āĻ• āĻ•āϰāĻž āĻšāĻŦ⧇ (W)">
+<!ENTITY  warnAddonInstall.accesskey    "W">
 <!-- LOCALIZATION NOTE (blockWebForgeries.label, blockAttackSites.label):
   The methods by which forged (phished) and attack sites will be detected by
   phishing providers will vary from human review to machine-based heuristics to a
   combination of both, so it's important that these strings and
   useDownloadedList.label convey the meaning "reported" (and not something like
   "known").
 -->
 
-<!ENTITY blockAttackSites.label "āϰāĻŋāĻĒā§‹āĻ°ā§āϟāĻ•ā§ƒāϤ āφāĻ•ā§āϰāĻŽāύāĻ•āĻžāϰ⧀ āϏāĻžāχāϟ āĻĒā§āϰāϤāĻŋāϰ⧋āϧ āĻ•āϰāĻž āĻšāĻŦ⧇ (k)">
-<!ENTITY blockAttackSites.accesskey "k">
+<!ENTITY  blockAttackSites.label     "āϰāĻŋāĻĒā§‹āĻ°ā§āϟāĻ•ā§ƒāϤ āφāĻ•ā§āϰāĻŽāύāĻ•āĻžāϰ⧀ āϏāĻžāχāϟ āĻĒā§āϰāϤāĻŋāϰ⧋āϧ āĻ•āϰāĻž āĻšāĻŦ⧇ (k)">
+<!ENTITY  blockAttackSites.accesskey "k">
 
-<!ENTITY blockWebForgeries.label "āϰāĻŋāĻĒā§‹āĻ°ā§āϟāĻ•ā§ƒāϤ āĻ“ā§Ÿā§‡āĻŦ āϜāĻžāϞāĻŋ⧟āĻžāϤāĻŋ āĻĒā§āϰāϤāĻŋāϰ⧋āϧ āĻ•āϰāĻž āĻšāĻŦ⧇ (B)">
-<!ENTITY blockWebForgeries.accesskey "B">
+<!ENTITY  blockWebForgeries.label     "āϰāĻŋāĻĒā§‹āĻ°ā§āϟāĻ•ā§ƒāϤ āĻ“ā§Ÿā§‡āĻŦ āϜāĻžāϞāĻŋ⧟āĻžāϤāĻŋ āĻĒā§āϰāϤāĻŋāϰ⧋āϧ āĻ•āϰāĻž āĻšāĻŦ⧇ (B)">
+<!ENTITY  blockWebForgeries.accesskey "B">
 
-<!ENTITY addonExceptions.label "āĻŦā§āϝāϤāĻŋāĻ•ā§āϰāĻŽ... (E)">
-<!ENTITY addonExceptions.accesskey "E">
+<!ENTITY  addonExceptions.label         "āĻŦā§āϝāϤāĻŋāĻ•ā§āϰāĻŽ... (E)">
+<!ENTITY  addonExceptions.accesskey     "E">
 
 
-<!ENTITY passwords.label "āĻĒāĻžāϏāĻ“ā§ŸāĻžāĻ°ā§āĻĄ">
+<!ENTITY  passwords.label               "āĻĒāĻžāϏāĻ“ā§ŸāĻžāĻ°ā§āĻĄ">
 
-<!ENTITY rememberPasswords.label "āĻ“ā§Ÿā§‡āĻŦāϏāĻžāχāĻŸā§‡āϰ āĻĒāĻžāϏāĻ“ā§ŸāĻžāĻ°ā§āĻĄ āĻŽāύ⧇ āϰāĻžāĻ–āĻž āĻšāĻŦ⧇ (R)">
-<!ENTITY rememberPasswords.accesskey "R">
-<!ENTITY passwordExceptions.label "āĻŦā§āϝāϤāĻŋāĻ•ā§āϰāĻŽ... (x)">
-<!ENTITY passwordExceptions.accesskey "x">
+<!ENTITY  rememberPasswords.label       "āĻ“ā§Ÿā§‡āĻŦāϏāĻžāχāĻŸā§‡āϰ āĻĒāĻžāϏāĻ“ā§ŸāĻžāĻ°ā§āĻĄ āĻŽāύ⧇ āϰāĻžāĻ–āĻž āĻšāĻŦ⧇ (R)">
+<!ENTITY  rememberPasswords.accesskey   "R">
+<!ENTITY  passwordExceptions.label      "āĻŦā§āϝāϤāĻŋāĻ•ā§āϰāĻŽ... (x)">
+<!ENTITY  passwordExceptions.accesskey  "x">
 
-<!ENTITY useMasterPassword.label "āĻŽāĻžāĻ¸ā§āϟāĻžāϰ āĻĒāĻžāϏāĻ“ā§ŸāĻžāĻ°ā§āĻĄ āĻŦā§āϝāĻŦāĻšāĻžāϰ āĻ•āϰāĻž āĻšāĻŦ⧇ (U)">
-<!ENTITY useMasterPassword.accesskey "U">
-<!ENTITY changeMasterPassword.label "āĻŽāĻžāĻ¸ā§āϟāĻžāϰ āĻĒāĻžāϏāĻ“ā§ŸāĻžāĻ°ā§āĻĄ āĻĒāϰāĻŋāĻŦāĻ°ā§āϤāύ... (M)">
-<!ENTITY changeMasterPassword.accesskey "M">
+<!ENTITY  useMasterPassword.label        "āĻŽāĻžāĻ¸ā§āϟāĻžāϰ āĻĒāĻžāϏāĻ“ā§ŸāĻžāĻ°ā§āĻĄ āĻŦā§āϝāĻŦāĻšāĻžāϰ āĻ•āϰāĻž āĻšāĻŦ⧇ (U)">
+<!ENTITY  useMasterPassword.accesskey    "U">
+<!ENTITY  changeMasterPassword.label     "āĻŽāĻžāĻ¸ā§āϟāĻžāϰ āĻĒāĻžāϏāĻ“ā§ŸāĻžāĻ°ā§āĻĄ āĻĒāϰāĻŋāĻŦāĻ°ā§āϤāύ... (M)">
+<!ENTITY  changeMasterPassword.accesskey "M">
 
-<!ENTITY savedPasswords.label "āϏāĻ‚āϰāĻ•ā§āώāĻŋāϤ āĻĒāĻžāϏāĻ“ā§ŸāĻžāĻ°ā§āĻĄâ€Ļ (P)">
-<!ENTITY savedPasswords.accesskey "P">
+<!ENTITY  savedPasswords.label            "āϏāĻ‚āϰāĻ•ā§āώāĻŋāϤ āĻĒāĻžāϏāĻ“ā§ŸāĻžāĻ°ā§āĻĄâ€Ļ (P)">
+<!ENTITY  savedPasswords.accesskey        "P">
--- a/browser/chrome/browser/preferences/sync.dtd
+++ b/browser/chrome/browser/preferences/sync.dtd
@@ -1,40 +1,40 @@
 <!-- The page shown when not logged in... -->
-<!ENTITY setupButton.label "&syncBrand.fullName.label; āϏ⧇āϟāφāĻĒ">
-<!ENTITY setupButton.accesskey "S">
-<!ENTITY weaveDesc.label "&syncBrand.fullName.label; āφāĻĒāύāĻžāϰ āχāϤāĻŋāĻšāĻžāϏ, āĻŦ⧁āĻ•āĻŽāĻžāĻ°ā§āĻ•, āĻĒāĻžāϏāĻ“ā§ŸāĻžāĻ°ā§āĻĄ āĻŦā§āϝāĻŦāĻšāĻžāϰ āĻ•āϰ⧇ āĻĄāĻŋāĻ­āĻžāχāϏ⧇ āĻŸā§āϝāĻžāĻŦ āϖ⧁āϞ⧁āύāĨ¤">
+<!ENTITY setupButton.label          "&syncBrand.fullName.label; āϏ⧇āϟāφāĻĒ">
+<!ENTITY setupButton.accesskey      "S">
+<!ENTITY weaveDesc.label            "&syncBrand.fullName.label; āφāĻĒāύāĻžāϰ āχāϤāĻŋāĻšāĻžāϏ, āĻŦ⧁āĻ•āĻŽāĻžāĻ°ā§āĻ•, āĻĒāĻžāϏāĻ“ā§ŸāĻžāĻ°ā§āĻĄ āĻŦā§āϝāĻŦāĻšāĻžāϰ āĻ•āϰ⧇ āĻĄāĻŋāĻ­āĻžāχāϏ⧇ āĻŸā§āϝāĻžāĻŦ āϖ⧁āϞ⧁āύāĨ¤">
 <!-- The page shown when logged in... -->
 <!-- Login error feedback -->
 
 
-<!ENTITY updatePass.label "āĻšāĻžāϞāύāĻžāĻ—āĻžāĻĻ">
-<!ENTITY resetPass.label "āĻĒ⧁āύāσāύāĻŋāĻ°ā§āϧāĻžāϰāĻŖ">
+<!ENTITY updatePass.label             "āĻšāĻžāϞāύāĻžāĻ—āĻžāĻĻ">
+<!ENTITY resetPass.label              "āĻĒ⧁āύāσāύāĻŋāĻ°ā§āϧāĻžāϰāĻŖ">
 <!-- Manage Account -->
 
-<!ENTITY manageAccount.label "āĻ…ā§āϝāĻžāĻ•āĻžāωāĻ¨ā§āϟ āĻŦā§āϝāĻŦāĻ¸ā§āĻĨāĻžāĻĒāύāĻž (A)">
-<!ENTITY manageAccount.accesskey "A">
-<!ENTITY viewQuota.label "āϕ⧋āϟāĻž āĻĒā§āϰāĻĻāĻ°ā§āĻļāύ">
-<!ENTITY changePassword.label "āĻĒāĻžāϏāĻ“ā§ŸāĻžāĻ°ā§āĻĄ āĻĒāϰāĻŋāĻŦāĻ°ā§āϤāύ">
-<!ENTITY mySyncKey.label "āφāĻŽāĻžāϰ āϏāĻŋāĻ™ā§āĻ• āϕ⧀">
-<!ENTITY resetSync.label "āϏāĻŋāĻ™ā§āĻ• āĻĒ⧁āύāσāύāĻŋāĻ°ā§āϧāĻžāϰāĻŖ">
-<!ENTITY addDevice.label "āĻĄāĻŋāĻ­āĻžāχāϏ āϝ⧋āĻ—">
+<!ENTITY manageAccount.label          "āĻ…ā§āϝāĻžāĻ•āĻžāωāĻ¨ā§āϟ āĻŦā§āϝāĻŦāĻ¸ā§āĻĨāĻžāĻĒāύāĻž (A)">
+<!ENTITY manageAccount.accesskey      "A">
+<!ENTITY viewQuota.label              "āϕ⧋āϟāĻž āĻĒā§āϰāĻĻāĻ°ā§āĻļāύ">
+<!ENTITY changePassword.label         "āĻĒāĻžāϏāĻ“ā§ŸāĻžāĻ°ā§āĻĄ āĻĒāϰāĻŋāĻŦāĻ°ā§āϤāύ">
+<!ENTITY mySyncKey.label              "āφāĻŽāĻžāϰ āϏāĻŋāĻ™ā§āĻ• āϕ⧀">
+<!ENTITY resetSync.label              "āϏāĻŋāĻ™ā§āĻ• āĻĒ⧁āύāσāύāĻŋāĻ°ā§āϧāĻžāϰāĻŖ">
+<!ENTITY addDevice.label              "āĻĄāĻŋāĻ­āĻžāχāϏ āϝ⧋āĻ—">
 
-<!ENTITY syncMy.label "āϏāĻŋāĻ™ā§āĻ• āφāĻŽāĻžāϰ">
-<!ENTITY engine.bookmarks.label "āĻŦ⧁āĻ•āĻŽāĻžāĻ°ā§āĻ• (m)">
+<!ENTITY syncMy.label               "āϏāĻŋāĻ™ā§āĻ• āφāĻŽāĻžāϰ">
+<!ENTITY engine.bookmarks.label     "āĻŦ⧁āĻ•āĻŽāĻžāĻ°ā§āĻ• (m)">
 <!ENTITY engine.bookmarks.accesskey "m">
-<!ENTITY engine.tabs.label "āĻŸā§āϝāĻžāĻŦ (T)">
-<!ENTITY engine.tabs.accesskey "T">
-<!ENTITY engine.history.label "āχāϤāĻŋāĻšāĻžāϏ (r)">
-<!ENTITY engine.history.accesskey "r">
-<!ENTITY engine.passwords.label "āĻĒāĻžāϏāĻ“ā§ŸāĻžāĻ°ā§āĻĄ (P)">
+<!ENTITY engine.tabs.label          "āĻŸā§āϝāĻžāĻŦ (T)">
+<!ENTITY engine.tabs.accesskey      "T">
+<!ENTITY engine.history.label       "āχāϤāĻŋāĻšāĻžāϏ (r)">
+<!ENTITY engine.history.accesskey   "r">
+<!ENTITY engine.passwords.label     "āĻĒāĻžāϏāĻ“ā§ŸāĻžāĻ°ā§āĻĄ (P)">
 <!ENTITY engine.passwords.accesskey "P">
-<!ENTITY engine.prefs.label "āĻĒāĻ›āĻ¨ā§āĻĻāϏāĻŽā§‚āĻš (s)">
-<!ENTITY engine.prefs.accesskey "s">
+<!ENTITY engine.prefs.label         "āĻĒāĻ›āĻ¨ā§āĻĻāϏāĻŽā§‚āĻš (s)">
+<!ENTITY engine.prefs.accesskey     "s">
 <!-- Device Settings -->
 
-<!ENTITY syncComputerName.label "āĻ•āĻŽā§āĻĒāĻŋāωāϟāĻžāϰ āύāĻžāĻŽ: (C)">
-<!ENTITY syncComputerName.accesskey "C">
-<!ENTITY deactivateDevice.label "āĻĄāĻŋāĻ­āĻžāχāϏ āύāĻŋāĻ¸ā§āĻ•ā§āϰāĻŋ⧟">
+<!ENTITY syncComputerName.label       "āĻ•āĻŽā§āĻĒāĻŋāωāϟāĻžāϰ āύāĻžāĻŽ: (C)">
+<!ENTITY syncComputerName.accesskey   "C">
+<!ENTITY deactivateDevice.label       "āĻĄāĻŋāĻ­āĻžāχāϏ āύāĻŋāĻ¸ā§āĻ•ā§āϰāĻŋ⧟">
 <!-- Footer stuff -->
 
-<!ENTITY prefs.tosLink.label "āϏ⧇āĻŦāĻžāϰ āĻļāĻ°ā§āϤ">
-<!ENTITY prefs.ppLink.label "āĻ—ā§‹āĻĒāĻ¨ā§€ā§ŸāϤāĻž āύ⧀āϤāĻŋ">
+<!ENTITY prefs.tosLink.label        "āϏ⧇āĻŦāĻžāϰ āĻļāĻ°ā§āϤ">
+<!ENTITY prefs.ppLink.label         "āĻ—ā§‹āĻĒāĻ¨ā§€ā§ŸāϤāĻž āύ⧀āϤāĻŋ">
--- a/browser/chrome/browser/preferences/tabs.dtd
+++ b/browser/chrome/browser/preferences/tabs.dtd
@@ -1,17 +1,17 @@
-<!ENTITY newWindowsAsTabs.label "āύāϤ⧁āύ āωāχāĻ¨ā§āĻĄā§‹āϗ⧁āϞ⧋, āύāϤ⧁āύ āĻŸā§āϝāĻžāĻŦ-āĻ āĻ–ā§‹āϞāĻž āĻšāĻŦ⧇ (t)">
-<!ENTITY newWindowsAsTabs.accesskey "t">
+<!ENTITY newWindowsAsTabs.label       "āύāϤ⧁āύ āωāχāĻ¨ā§āĻĄā§‹āϗ⧁āϞ⧋, āύāϤ⧁āύ āĻŸā§āϝāĻžāĻŦ-āĻ āĻ–ā§‹āϞāĻž āĻšāĻŦ⧇ (t)">
+<!ENTITY newWindowsAsTabs.accesskey   "t">
 
-<!ENTITY warnCloseMultipleTabs.label "āĻāĻ•āĻžāϧāĻŋāĻ• āĻŸā§āϝāĻžāĻŦ āĻŦāĻ¨ā§āϧ āĻ•āϰāĻžāϰ āĻšā§‡āĻˇā§āϟāĻž āĻ•āϰāĻž āĻšāϞ⧇ āϏāϤāĻ°ā§āĻ• āĻ•āϰāĻž āĻšāĻŦ⧇ (m)">
-<!ENTITY warnCloseMultipleTabs.accesskey "m">
+<!ENTITY warnCloseMultipleTabs.label  "āĻāĻ•āĻžāϧāĻŋāĻ• āĻŸā§āϝāĻžāĻŦ āĻŦāĻ¨ā§āϧ āĻ•āϰāĻžāϰ āĻšā§‡āĻˇā§āϟāĻž āĻ•āϰāĻž āĻšāϞ⧇ āϏāϤāĻ°ā§āĻ• āĻ•āϰāĻž āĻšāĻŦ⧇ (m)">
+<!ENTITY warnCloseMultipleTabs.accesskey  "m">
 
-<!ENTITY warnOpenManyTabs.label "āĻāĻ•āĻžāϧāĻŋāĻ• āĻŸā§āϝāĻžāĻŦ āĻ–ā§‹āϞāĻžāϰ āĻĢāϞ⧇ &brandShortName; āϧ⧀āϰ āĻšā§Ÿā§‡ āϝāĻžāĻŦāĻžāϰ āϏāĻŽā§āĻ­āĻŦāύāĻž āĻĨāĻžāĻ•āϞ⧇ āϏāϤāĻ°ā§āĻ• āĻ•āϰāĻž āĻšāĻŦ⧇ (O)">
-<!ENTITY warnOpenManyTabs.accesskey "O">
+<!ENTITY warnOpenManyTabs.label       "āĻāĻ•āĻžāϧāĻŋāĻ• āĻŸā§āϝāĻžāĻŦ āĻ–ā§‹āϞāĻžāϰ āĻĢāϞ⧇ &brandShortName; āϧ⧀āϰ āĻšā§Ÿā§‡ āϝāĻžāĻŦāĻžāϰ āϏāĻŽā§āĻ­āĻŦāύāĻž āĻĨāĻžāĻ•āϞ⧇ āϏāϤāĻ°ā§āĻ• āĻ•āϰāĻž āĻšāĻŦ⧇ (O)">
+<!ENTITY warnOpenManyTabs.accesskey   "O">
 
-<!ENTITY showTabBar.label "āĻŸā§āϝāĻžāĻŦ āĻŦāĻžāϰ āϏāĻŦ āϏāĻŽā§Ÿ āĻĒā§āϰāĻĻāĻ°ā§āĻļāύ āĻ•āϰāĻž āĻšāĻŦ⧇ (b)">
-<!ENTITY showTabBar.accesskey "b">
+<!ENTITY showTabBar.label             "āĻŸā§āϝāĻžāĻŦ āĻŦāĻžāϰ āϏāĻŦ āϏāĻŽā§Ÿ āĻĒā§āϰāĻĻāĻ°ā§āĻļāύ āĻ•āϰāĻž āĻšāĻŦ⧇ (b)">
+<!ENTITY showTabBar.accesskey         "b">
 
-<!ENTITY switchToNewTabs.label "āύāϤ⧁āύ āĻŸā§āϝāĻžāĻŦ⧇ āϞāĻŋāĻ‚āĻ• āĻ–ā§‹āϞāĻž āĻšāϞ⧇ āϏāĻžāĻĨ⧇ āϏāĻžāĻĨ⧇ āĻŸā§āϝāĻžāĻŦāϟāĻŋ āĻĒā§āϰāĻĻāĻ°ā§āĻļāύ āĻ•āϰāĻž āĻšāĻŦ⧇ (s)">
-<!ENTITY switchToNewTabs.accesskey "s">
+<!ENTITY switchToNewTabs.label        "āύāϤ⧁āύ āĻŸā§āϝāĻžāĻŦ⧇ āϞāĻŋāĻ‚āĻ• āĻ–ā§‹āϞāĻž āĻšāϞ⧇ āϏāĻžāĻĨ⧇ āϏāĻžāĻĨ⧇ āĻŸā§āϝāĻžāĻŦāϟāĻŋ āĻĒā§āϰāĻĻāĻ°ā§āĻļāύ āĻ•āϰāĻž āĻšāĻŦ⧇ (s)">
+<!ENTITY switchToNewTabs.accesskey    "s">
 
-<!ENTITY showTabsInTaskbar.label "āωāχāĻ¨ā§āĻĄā§‹ āϟāĻžāĻ•ā§āϏāĻŦāĻžāϰ⧇ āĻŸā§āϝāĻžāĻŦ⧇āϰ āĻĒā§āϰāĻžāĻ•āĻĻāĻ°ā§āĻļāύ āĻĒā§āϰāĻĻāĻ°ā§āĻļāύ (k)">
-<!ENTITY showTabsInTaskbar.accesskey "k">
+<!ENTITY showTabsInTaskbar.label          "āωāχāĻ¨ā§āĻĄā§‹ āϟāĻžāĻ•ā§āϏāĻŦāĻžāϰ⧇ āĻŸā§āϝāĻžāĻŦ⧇āϰ āĻĒā§āϰāĻžāĻ•āĻĻāĻ°ā§āĻļāύ āĻĒā§āϰāĻĻāĻ°ā§āĻļāύ (k)">
+<!ENTITY showTabsInTaskbar.accesskey      "k">
--- a/browser/chrome/browser/safeMode.dtd
+++ b/browser/chrome/browser/safeMode.dtd
@@ -31,31 +31,31 @@
    - decision by deleting the provisions above and replace them with the notice
    - and other provisions required by the LGPL or the GPL. If you do not delete
    - the provisions above, a recipient may use your version of this file under
    - the terms of any one of the MPL, the GPL or the LGPL.
    -
 #endif
    - ***** END LICENSE BLOCK ***** -->
 
-<!ENTITY safeModeDialog.title "&brandShortName; āύāĻŋāϰāĻžāĻĒāĻĻ āĻŽā§‹āĻĄ">
-<!ENTITY window.width "37em">
+<!ENTITY safeModeDialog.title         "&brandShortName; āύāĻŋāϰāĻžāĻĒāĻĻ āĻŽā§‹āĻĄ">
+<!ENTITY window.width                 "37em">
 
-<!ENTITY safeModeDescription.label "āĻŦāĻ°ā§āϤāĻŽāĻžāύ⧇ &brandShortName; āύāĻŋāϰāĻžāĻĒāĻĻ āĻŽā§‹āĻĄā§‡ āϚāϞāϛ⧇āĨ¤ āϏāĻžāĻŽā§ŸāĻŋāĻ•āĻ­āĻžāĻŦ⧇ āφāĻĒāύāĻžāϰ āĻ¸ā§āĻŦāύāĻŋāĻ°ā§āϧāĻžāϰāĻŋāϤ āϏ⧇āϟāĻŋāĻ‚, āĻĨā§€āĻŽ āĻ“ āĻāĻ•ā§āϏāĻŸā§‡āύāĻļāύ āύāĻŋāĻˇā§āĻ•ā§āϰāĻŋ⧟ āĻ•āϰāĻž āĻšāĻŦ⧇āĨ¤">
-<!ENTITY safeModeDescription2.label "āφāĻĒāύāĻŋ āĻĒāϰāĻŋāĻŦāĻ°ā§āϤāύāϗ⧁āϞ⧋ āĻĨ⧇āϕ⧇ āĻŦāĻžāĻ›āĻžāχ āĻ•āϰ⧇ āϤāĻž āĻ¸ā§āĻĨāĻžāϝāĻŧā§€āĻ­āĻžāĻŦ⧇ āĻĒā§āĻ°ā§Ÿā§‹āĻ— āĻ•āϰāϤ⧇ āĻĒāĻžāϰ⧇āύ:">
+<!ENTITY safeModeDescription.label    "āĻŦāĻ°ā§āϤāĻŽāĻžāύ⧇ &brandShortName; āύāĻŋāϰāĻžāĻĒāĻĻ āĻŽā§‹āĻĄā§‡ āϚāϞāϛ⧇āĨ¤ āϏāĻžāĻŽā§ŸāĻŋāĻ•āĻ­āĻžāĻŦ⧇ āφāĻĒāύāĻžāϰ āĻ¸ā§āĻŦāύāĻŋāĻ°ā§āϧāĻžāϰāĻŋāϤ āϏ⧇āϟāĻŋāĻ‚, āĻĨā§€āĻŽ āĻ“ āĻāĻ•ā§āϏāĻŸā§‡āύāĻļāύ āύāĻŋāĻˇā§āĻ•ā§āϰāĻŋ⧟ āĻ•āϰāĻž āĻšāĻŦ⧇āĨ¤">
+<!ENTITY safeModeDescription2.label   "āφāĻĒāύāĻŋ āĻĒāϰāĻŋāĻŦāĻ°ā§āϤāύāϗ⧁āϞ⧋ āĻĨ⧇āϕ⧇ āĻŦāĻžāĻ›āĻžāχ āĻ•āϰ⧇ āϤāĻž āĻ¸ā§āĻĨāĻžāϝāĻŧā§€āĻ­āĻžāĻŦ⧇ āĻĒā§āĻ°ā§Ÿā§‹āĻ— āĻ•āϰāϤ⧇ āĻĒāĻžāϰ⧇āύ:">
 
-<!ENTITY disableAddons.label "āϏāĻŦ āĻ…ā§āϝāĻžāĻĄ-āĻ…āύ āύāĻŋāĻˇā§āĻ•ā§āϰāĻŋ⧟ āĻ•āϰāĻž āĻšāĻŦ⧇ (D)">
-<!ENTITY disableAddons.accesskey "D">
+<!ENTITY disableAddons.label          "āϏāĻŦ āĻ…ā§āϝāĻžāĻĄ-āĻ…āύ āύāĻŋāĻˇā§āĻ•ā§āϰāĻŋ⧟ āĻ•āϰāĻž āĻšāĻŦ⧇ (D)">
+<!ENTITY disableAddons.accesskey      "D">
 
-<!ENTITY resetToolbars.label "āϟ⧁āϞāĻŦāĻžāϰ āĻ“ āĻ•āĻ¨ā§āĻŸā§āϰ⧋āϞ āĻĒ⧁āύāσāύāĻŋāĻ°ā§āϧāĻžāϰāĻŖ (R)">
-<!ENTITY resetToolbars.accesskey "R">
+<!ENTITY resetToolbars.label          "āϟ⧁āϞāĻŦāĻžāϰ āĻ“ āĻ•āĻ¨ā§āĻŸā§āϰ⧋āϞ āĻĒ⧁āύāσāύāĻŋāĻ°ā§āϧāĻžāϰāĻŖ (R)">
+<!ENTITY resetToolbars.accesskey      "R">
 
-<!ENTITY deleteBookmarks.label "āĻŦā§āϝāĻžāĻ•āφāĻĒ⧇ āϰāĻžāĻ–āĻž āĻŦ⧁āĻ•āĻŽāĻžāĻ°ā§āĻ• āĻ›āĻžā§œāĻž āϏāĻŦ āĻŦ⧁āĻ•āĻŽāĻžāĻ°ā§āĻ• āĻŽā§āϛ⧇ āĻĢ⧇āϞ⧁āύ (b)">
-<!ENTITY deleteBookmarks.accesskey "b">
+<!ENTITY deleteBookmarks.label        "āĻŦā§āϝāĻžāĻ•āφāĻĒ⧇ āϰāĻžāĻ–āĻž āĻŦ⧁āĻ•āĻŽāĻžāĻ°ā§āĻ• āĻ›āĻžā§œāĻž āϏāĻŦ āĻŦ⧁āĻ•āĻŽāĻžāĻ°ā§āĻ• āĻŽā§āϛ⧇ āĻĢ⧇āϞ⧁āύ (b)">
+<!ENTITY deleteBookmarks.accesskey    "b">
 
-<!ENTITY resetUserPrefs.label "āĻŦā§āϝāĻŦāĻšāĻžāϰāĻ•āĻžāϰ⧀āϰ āĻĒāĻ›āĻ¨ā§āĻĻāϏāĻŽā§‚āĻš &brandShortName; āĻāϰ āĻĄāĻŋāĻĢāĻ˛ā§āϟ āĻŽāĻžāύ⧇ āĻĒ⧁āύāσāύāĻŋāĻ°ā§āϧāĻžāϰāĻŖ (P)">
-<!ENTITY resetUserPrefs.accesskey "P">
+<!ENTITY resetUserPrefs.label         "āĻŦā§āϝāĻŦāĻšāĻžāϰāĻ•āĻžāϰ⧀āϰ āĻĒāĻ›āĻ¨ā§āĻĻāϏāĻŽā§‚āĻš &brandShortName; āĻāϰ āĻĄāĻŋāĻĢāĻ˛ā§āϟ āĻŽāĻžāύ⧇ āĻĒ⧁āύāσāύāĻŋāĻ°ā§āϧāĻžāϰāĻŖ (P)">
+<!ENTITY resetUserPrefs.accesskey     "P">
 
-<!ENTITY restoreSearch.label "āĻĄāĻŋāĻĢāĻ˛ā§āϟ āĻ…āύ⧁āϏāĻ¨ā§āϧāĻžāύ āχāύāϜāĻŋāύ āĻĒ⧁āύāσāĻ¸ā§āĻĨāĻžāĻĒāύ (S)">
-<!ENTITY restoreSearch.accesskey "S">
+<!ENTITY restoreSearch.label          "āĻĄāĻŋāĻĢāĻ˛ā§āϟ āĻ…āύ⧁āϏāĻ¨ā§āϧāĻžāύ āχāύāϜāĻŋāύ āĻĒ⧁āύāσāĻ¸ā§āĻĨāĻžāĻĒāύ (S)">
+<!ENTITY restoreSearch.accesskey      "S">
 
 <!ENTITY changeAndRestartButton.label "āĻĒāϰāĻŋāĻŦāĻ°ā§āϤāύ āĻ•āϰ⧇ āφāĻŦāĻžāϰ āϚāĻžāϞ⧁ āĻ•āϰāĻž āĻšāĻŦ⧇">
-<!ENTITY continueButton.label "āύāĻŋāϰāĻžāĻĒāĻĻ āĻŽā§‹āĻĄ āϚāĻžāϞ⧁ āϰāĻžāĻ–āĻž āĻšāĻŦ⧇">
+<!ENTITY continueButton.label         "āύāĻŋāϰāĻžāĻĒāĻĻ āĻŽā§‹āĻĄ āϚāĻžāϞ⧁ āϰāĻžāĻ–āĻž āĻšāĻŦ⧇">
--- a/browser/chrome/browser/safebrowsing/report-phishing.dtd
+++ b/browser/chrome/browser/safebrowsing/report-phishing.dtd
@@ -1,2 +1,2 @@
-<!ENTITY reportPhishSiteMenu.title2 "āĻ“ā§Ÿā§‡āĻŦ āϜāĻžāϞāĻŋ⧟āĻžāϤāĻŋ āϰāĻŋāĻĒā§‹āĻ°ā§āϟ āĻ•āϰ⧁āύâ€Ļ (F)">
-<!ENTITY reportPhishSiteMenu.accesskey "F">
+<!ENTITY reportPhishSiteMenu.title2         "āĻ“ā§Ÿā§‡āĻŦ āϜāĻžāϞāĻŋ⧟āĻžāϤāĻŋ āϰāĻŋāĻĒā§‹āĻ°ā§āϟ āĻ•āϰ⧁āύâ€Ļ (F)">
+<!ENTITY reportPhishSiteMenu.accesskey      "F">
--- a/browser/chrome/browser/sanitize.dtd
+++ b/browser/chrome/browser/sanitize.dtd
@@ -1,62 +1,62 @@
-<!ENTITY sanitizePrefs2.title "āχāϤāĻŋāĻšāĻžāϏ āĻ…āĻĒāϏāĻžāϰāϪ⧇āϰ āϏ⧇āϟāĻŋāĻ‚">
-<!ENTITY sanitizeDialog2.title "āϏāĻžāĻŽā§āĻĒā§āϰāϤāĻŋāĻ• āχāϤāĻŋāĻšāĻžāϏ āĻ…āĻĒāϏāĻžāϰāĻŖ">
+<!ENTITY sanitizePrefs2.title          "āχāϤāĻŋāĻšāĻžāϏ āĻ…āĻĒāϏāĻžāϰāϪ⧇āϰ āϏ⧇āϟāĻŋāĻ‚">
+<!ENTITY sanitizeDialog2.title         "āϏāĻžāĻŽā§āĻĒā§āϰāϤāĻŋāĻ• āχāϤāĻŋāĻšāĻžāϏ āĻ…āĻĒāϏāĻžāϰāĻŖ">
 
-<!ENTITY sanitizeItems.label "āύāĻŋāĻŽā§āύāϞāĻŋāĻ–āĻŋāϤ āφāχāĻŸā§‡āĻŽ āĻāĻ–āύ āĻŽā§āϛ⧇ āĻĢ⧇āϞāĻž āĻšāĻŦ⧇:">
-<!ENTITY clearDataSettings2.label "āϝāĻ–āύ &brandShortName; āĻŦāĻ¨ā§āϧ āĻ•āϰāĻž āĻšāĻŦ⧇, āĻ¸ā§āĻŦ⧟āĻ‚āĻ•ā§āϰāĻŋ⧟āĻ­āĻžāĻŦ⧇ āϏāĻŦ āĻŽā§āϛ⧇ āĻĢ⧇āϞāĻž  āĻšāĻŦ⧇:">
+<!ENTITY sanitizeItems.label          "āύāĻŋāĻŽā§āύāϞāĻŋāĻ–āĻŋāϤ āφāχāĻŸā§‡āĻŽ āĻāĻ–āύ āĻŽā§āϛ⧇ āĻĢ⧇āϞāĻž āĻšāĻŦ⧇:">
+<!ENTITY clearDataSettings2.label     "āϝāĻ–āύ &brandShortName; āĻŦāĻ¨ā§āϧ āĻ•āϰāĻž āĻšāĻŦ⧇, āĻ¸ā§āĻŦ⧟āĻ‚āĻ•ā§āϰāĻŋ⧟āĻ­āĻžāĻŦ⧇ āϏāĻŦ āĻŽā§āϛ⧇ āĻĢ⧇āϞāĻž  āĻšāĻŦ⧇:">
 <!-- XXX rearrange entities to match physical layout when l10n isn't an issue -->
 <!-- LOCALIZATION NOTE (clearTimeDuration.*): "Time range to clear" dropdown.
      See UI mockup at bug 480169 -->
 
-<!ENTITY clearTimeDuration.label "āχāϤāĻŋāĻšāĻžāϏ āĻ…āĻĒāϏāĻžāϰāϪ⧇āϰ āϏāĻŽā§Ÿā§‡āϰ āĻĒāϰāĻŋāϏāϰ: (T)">
-<!ENTITY clearTimeDuration.accesskey "T">
-<!ENTITY clearTimeDuration.lastHour "āĻ—āϤ ā§§ āϘāĻ¨ā§āϟāĻž">
-<!ENTITY clearTimeDuration.last2Hours "āĻ—āϤ ⧍ āϘāĻ¨ā§āϟāĻž">
-<!ENTITY clearTimeDuration.last4Hours "āĻ—āϤ ā§Ē āϘāĻ¨ā§āϟāĻž">
-<!ENTITY clearTimeDuration.today "āφāϜ āϏāĻžāϰāĻžāĻĻāĻŋāύ">
-<!ENTITY clearTimeDuration.everything "āϏāĻŦ">
+<!ENTITY clearTimeDuration.label          "āχāϤāĻŋāĻšāĻžāϏ āĻ…āĻĒāϏāĻžāϰāϪ⧇āϰ āϏāĻŽā§Ÿā§‡āϰ āĻĒāϰāĻŋāϏāϰ: (T)">
+<!ENTITY clearTimeDuration.accesskey      "T">
+<!ENTITY clearTimeDuration.lastHour       "āĻ—āϤ ā§§ āϘāĻ¨ā§āϟāĻž">
+<!ENTITY clearTimeDuration.last2Hours     "āĻ—āϤ ⧍ āϘāĻ¨ā§āϟāĻž">
+<!ENTITY clearTimeDuration.last4Hours     "āĻ—āϤ ā§Ē āϘāĻ¨ā§āϟāĻž">
+<!ENTITY clearTimeDuration.today          "āφāϜ āϏāĻžāϰāĻžāĻĻāĻŋāύ">
+<!ENTITY clearTimeDuration.everything     "āϏāĻŦ">
 <!-- Localization note (clearTimeDuration.suffix) - trailing entity for languages
 that require it.  -->
-<!ENTITY clearTimeDuration.suffix "">
-<!ENTITY clearTimeDuration.dateColumn "āĻĒāϰāĻŋāĻĻāĻ°ā§āĻļāύ⧇āϰ āϤāĻžāϰāĻŋāĻ–">
-<!ENTITY clearTimeDuration.nameColumn "āύāĻžāĻŽ">
+<!ENTITY clearTimeDuration.suffix         "">
+<!ENTITY clearTimeDuration.dateColumn     "āĻĒāϰāĻŋāĻĻāĻ°ā§āĻļāύ⧇āϰ āϤāĻžāϰāĻŋāĻ–">
+<!ENTITY clearTimeDuration.nameColumn     "āύāĻžāĻŽ">
 <!-- LOCALIZATION NOTE (detailsProgressiveDisclosure.*): Labels and accesskeys
      of the "Details" progressive disclosure button.  See UI mockup at bug
      480169 -->
 
-<!ENTITY detailsProgressiveDisclosure.label "āĻŦāĻŋāĻŦāϰāĻŖ (e)">
+<!ENTITY detailsProgressiveDisclosure.label     "āĻŦāĻŋāĻŦāϰāĻŖ (e)">
 <!ENTITY detailsProgressiveDisclosure.accesskey "e">
 
-<!ENTITY historySection.label "āχāϤāĻŋāĻšāĻžāϏ">
-<!ENTITY dataSection.label "āϤāĻĨā§āϝ">
+<!ENTITY historySection.label         "āχāϤāĻŋāĻšāĻžāϏ">
+<!ENTITY dataSection.label            "āϤāĻĨā§āϝ">
 <!-- LOCALIZATION NOTE (item*): itemHistoryAndDownloads.* and
      itemBrowsingHistory.* will never be used at the same time, so they can
      have the same accesskey. -->
 
-<!ENTITY itemHistoryAndDownloads.label "āĻŦā§āϰāĻžāωāϜāĻŋāĻ‚ āĻ“ āĻĄāĻžāωāύāϞ⧋āĻĄ āχāϤāĻŋāĻšāĻžāϏ (B)">
+<!ENTITY itemHistoryAndDownloads.label     "āĻŦā§āϰāĻžāωāϜāĻŋāĻ‚ āĻ“ āĻĄāĻžāωāύāϞ⧋āĻĄ āχāϤāĻŋāĻšāĻžāϏ (B)">
 <!ENTITY itemHistoryAndDownloads.accesskey "B">
-<!ENTITY itemBrowsingHistory.label "āĻŦā§āϰāĻžāωāϜāĻŋāĻ‚ āχāϤāĻŋāĻšāĻžāϏ (B)">
-<!ENTITY itemBrowsingHistory.accesskey "B">
-<!ENTITY itemFormSearchHistory.label "āĻĢāĻ°ā§āĻŽ āĻ“ āĻ…āύ⧁āϏāĻ¨ā§āϧāĻžāύ⧇āϰ āχāϤāĻŋāĻšāĻžāϏ (F)">
-<!ENTITY itemFormSearchHistory.accesskey "F">
-<!ENTITY itemPasswords.label "āϏāĻ‚āϰāĻ•ā§āώāĻŋāϤ āĻĒāĻžāϏāĻ“ā§ŸāĻžāĻ°ā§āĻĄ (P)">
-<!ENTITY itemPasswords.accesskey "P">
-<!ENTITY itemCookies.label "āϕ⧁āĻ•āĻŋ (C)">
-<!ENTITY itemCookies.accesskey "C">
-<!ENTITY itemCache.label "āĻ•ā§āϝāĻžāĻļ (a)">
-<!ENTITY itemCache.accesskey "a">
-<!ENTITY itemOfflineApps.label "āĻ…āĻĢāϞāĻžāχāύ āĻ“ā§Ÿā§‡āĻŦāϏāĻžāχāĻŸā§‡āϰ āϤāĻĨā§āϝ (O)">
-<!ENTITY itemOfflineApps.accesskey "O">
-<!ENTITY itemDownloadHistory.label "āĻĄāĻžāωāύāϞ⧋āĻĄ āχāϤāĻŋāĻšāĻžāϏ (D)">
-<!ENTITY itemDownloadHistory.accesskey "D">
-<!ENTITY itemActiveLogins.label "āϏāĻ•ā§āϰāĻŋ⧟ āϞāĻ—āχāύ (L)">
-<!ENTITY itemActiveLogins.accesskey "L">
-<!ENTITY itemSitePreferences.label "āϏāĻžāχāϟ āϏāĻ‚āĻ•ā§āϰāĻžāĻ¨ā§āϤ āĻĒāĻ›āĻ¨ā§āĻĻāϏāĻŽā§‚āĻš (S)">
-<!ENTITY itemSitePreferences.accesskey "S">
+<!ENTITY itemBrowsingHistory.label         "āĻŦā§āϰāĻžāωāϜāĻŋāĻ‚ āχāϤāĻŋāĻšāĻžāϏ (B)">
+<!ENTITY itemBrowsingHistory.accesskey     "B">
+<!ENTITY itemFormSearchHistory.label       "āĻĢāĻ°ā§āĻŽ āĻ“ āĻ…āύ⧁āϏāĻ¨ā§āϧāĻžāύ⧇āϰ āχāϤāĻŋāĻšāĻžāϏ (F)">
+<!ENTITY itemFormSearchHistory.accesskey   "F">
+<!ENTITY itemPasswords.label               "āϏāĻ‚āϰāĻ•ā§āώāĻŋāϤ āĻĒāĻžāϏāĻ“ā§ŸāĻžāĻ°ā§āĻĄ (P)">
+<!ENTITY itemPasswords.accesskey           "P">
+<!ENTITY itemCookies.label                 "āϕ⧁āĻ•āĻŋ (C)">
+<!ENTITY itemCookies.accesskey             "C">
+<!ENTITY itemCache.label                   "āĻ•ā§āϝāĻžāĻļ (a)">
+<!ENTITY itemCache.accesskey               "a">
+<!ENTITY itemOfflineApps.label             "āĻ…āĻĢāϞāĻžāχāύ āĻ“ā§Ÿā§‡āĻŦāϏāĻžāχāĻŸā§‡āϰ āϤāĻĨā§āϝ (O)">
+<!ENTITY itemOfflineApps.accesskey         "O">
+<!ENTITY itemDownloadHistory.label         "āĻĄāĻžāωāύāϞ⧋āĻĄ āχāϤāĻŋāĻšāĻžāϏ (D)">
+<!ENTITY itemDownloadHistory.accesskey     "D">
+<!ENTITY itemActiveLogins.label            "āϏāĻ•ā§āϰāĻŋ⧟ āϞāĻ—āχāύ (L)">
+<!ENTITY itemActiveLogins.accesskey        "L">
+<!ENTITY itemSitePreferences.label         "āϏāĻžāχāϟ āϏāĻ‚āĻ•ā§āϰāĻžāĻ¨ā§āϤ āĻĒāĻ›āĻ¨ā§āĻĻāϏāĻŽā§‚āĻš (S)">
+<!ENTITY itemSitePreferences.accesskey     "S">
 <!-- LOCALIZATION NOTE (sanitizeEverythingUndoWarning): Second warning paragraph
      that appears when "Time range to clear" is set to "Everything".  See UI
      mockup at bug 480169 -->
 
-<!ENTITY sanitizeEverythingUndoWarning "āĻāχ āĻĒāϰāĻŋāĻŦāĻ°ā§āϤāύāϟāĻŋ āĻ…āĻĒāϰāĻŋāĻŦāĻ°ā§āϤāĻ¨ā§€ā§Ÿ!">
+<!ENTITY sanitizeEverythingUndoWarning     "āĻāχ āĻĒāϰāĻŋāĻŦāĻ°ā§āϤāύāϟāĻŋ āĻ…āĻĒāϰāĻŋāĻŦāĻ°ā§āϤāĻ¨ā§€ā§Ÿ!">
 
-<!ENTITY dialog.width "36em">
-<!ENTITY column.width "20em">
+<!ENTITY dialog.width                 "36em">
+<!ENTITY column.width                 "20em">
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/scratchpad.dtd
@@ -0,0 +1,123 @@
+<!-- LOCALIZATION NOTE : FILE This file contains the Scratchpad window strings -->
+<!-- LOCALIZATION NOTE : FILE Do not translate commandkeys -->
+
+<!-- LOCALIZATION NOTE (scratchpad.title):
+  -  The Scratchpad is intended to provide a simple text editor for creating
+  -  and evaluating bits of JavaScript code for the purposes of function
+  -  prototyping, experimentation and convenient scripting.
+  -
+  -  It's quite possible that you won't have a good analogue for the word
+  -  "Scratchpad" in your locale. You should feel free to find a close
+  -  approximation to it or choose a word (or words) that means
+  -  "simple discardable text editor". -->
+<!ENTITY window.title                 "Scratchpad">
+
+<!ENTITY fileMenu.label               "File">
+<!ENTITY fileMenu.accesskey           "F">
+
+<!ENTITY newWindowCmd.label           "New Window">
+<!ENTITY newWindowCmd.accesskey       "N">
+<!ENTITY newWindowCmd.commandkey      "n">
+
+<!ENTITY openFileCmd.label            "Open Fileâ€Ļ">
+<!ENTITY openFileCmd.accesskey        "O">
+<!ENTITY openFileCmd.commandkey       "o">
+
+<!ENTITY saveFileCmd.label            "Save">
+<!ENTITY saveFileCmd.accesskey        "S">
+<!ENTITY saveFileCmd.commandkey       "s">
+
+<!ENTITY saveFileAsCmd.label          "Save Asâ€Ļ">
+<!ENTITY saveFileAsCmd.accesskey      "A">
+
+<!ENTITY closeCmd.label               "Close">
+<!ENTITY closeCmd.key                 "W">
+<!ENTITY closeCmd.accesskey           "C">
+
+<!ENTITY editMenu.label               "Edit">
+<!ENTITY editMenu.accesskey           "E">
+
+<!ENTITY undoCmd.label                "Undo">
+<!ENTITY undoCmd.key                  "Z">
+<!ENTITY undoCmd.accesskey            "U">
+
+<!ENTITY redoCmd.label                "Redo">
+<!ENTITY redoCmd.key                  "Y">
+<!ENTITY redoCmd.accesskey            "R">
+
+<!ENTITY cutCmd.label                 "Cut">
+<!ENTITY cutCmd.key                   "X">
+<!ENTITY cutCmd.accesskey             "t">
+
+<!ENTITY copyCmd.label                "Copy">
+<!ENTITY copyCmd.key                  "C">
+<!ENTITY copyCmd.accesskey            "C">
+
+<!ENTITY pasteCmd.label               "Paste">
+<!ENTITY pasteCmd.key                 "V">
+<!ENTITY pasteCmd.accesskey           "P">
+
+<!ENTITY selectAllCmd.label           "Select All">
+<!ENTITY selectAllCmd.key             "A">
+<!ENTITY selectAllCmd.accesskey       "A">
+
+<!ENTITY run.label                    "Run">
+<!ENTITY run.accesskey                "R">
+<!ENTITY run.key                      "r">
+
+<!ENTITY inspect.label                "Inspect">
+<!ENTITY inspect.accesskey            "I">
+<!ENTITY inspect.key                  "i">
+
+<!ENTITY display.label                "Display">
+<!ENTITY display.accesskey            "D">
+<!ENTITY display.key                  "l">
+
+<!-- LOCALIZATION NOTE (environmentMenu.label, accesskey): This menu item was
+  -  renamed from "Context" to avoid confusion with the right-click context
+  -  menu in the text area. It refers to the JavaScript Environment (or context)
+  -  the user is evaluating against. I.e., Content (current tab) or Chrome
+  -  (browser).
+  -->
+<!ENTITY environmentMenu.label        "Environment">
+<!ENTITY environmentMenu.accesskey    "N">
+
+
+<!ENTITY contentContext.label         "Content">
+<!ENTITY contentContext.accesskey     "C">
+
+<!-- LOCALIZATION NOTE (browserContext.label, accesskey): This menu item is used
+  -  to select an execution environment for the browser window itself as opposed
+  -  to content. This is a feature for browser and addon developers and only
+  -  enabled via the devtools.chrome.enabled preference. Formerly, this label
+  -  was called "Chrome".
+  -->
+<!ENTITY browserContext.label         "Browser">
+<!ENTITY browserContext.accesskey     "B">
+
+<!-- LOCALIZATION NOTE (resetContext.label): This command allows the developer
+  -  to reset/clear the global object of the environment where the code executes.
+  -->
+<!ENTITY resetContext.label           "Reset">
+<!ENTITY resetContext.accesskey       "R">
+
+<!ENTITY executeMenu.label            "Execute">
+<!ENTITY executeMenu.accesskey        "X">
+
+<!ENTITY toolsMenu.label              "Tools">
+<!ENTITY toolsMenu.accesskey          "T">
+
+<!ENTITY errorConsoleCmd.label        "Error Console">
+<!ENTITY errorConsoleCmd.accesskey    "C">
+<!ENTITY errorConsoleCmd.commandkey   "j">
+
+<!ENTITY webConsoleCmd.label          "Web Console">
+<!ENTITY webConsoleCmd.accesskey      "W">
+<!ENTITY webConsoleCmd.commandkey     "k">
+
+<!-- LOCALIZATION NOTE (textbox.placeholder1): This is some placeholder text
+  -  that appears when the Scratchpad's text area is empty and unfocused.
+  -  It should be a one-line JavaScript comment, i.e., preceded by '//'
+  -->
+<!ENTITY textbox.placeholder1         "// Enter some JavaScript, select it, right click and select Run, Inspect or Display.">
+
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/scratchpad.properties
@@ -0,0 +1,35 @@
+# LOCALIZATION NOTE  (propertyPanel.updateButton.label): Used in the Property
+# Panel that is opened by the Scratchpad window when inspecting an object. This
+# is the Update button label.
+propertyPanel.updateButton.label=Update
+propertyPanel.updateButton.accesskey=U
+
+# LOCALIZATION NOTE  (export.fileOverwriteConfirmation): This is displayed when
+# the user attempts to save to an already existing file.
+export.fileOverwriteConfirmation=File exists. Overwrite?
+
+# LOCALIZATION NOTE  (browserWindow.unavailable): This error message is shown
+# when Scratchpad does not find any recently active window of navigator:browser
+# type.
+browserWindow.unavailable=Scratchpad cannot find any browser window to execute the code in.
+
+# LOCALIZATION NOTE  (openFile.title): This is the file picker title, when you
+# open a file from Scratchpad.
+openFile.title=Open File
+
+# LOCALIZATION NOTE  (openFile.failed): This is the message displayed when file
+# open fails.
+openFile.failed=Failed to read the file.
+
+# LOCALIZATION NOTE  (saveFileAs): This is the file picker title, when you save
+# a file in Scratchpad.
+saveFileAs=Save File As
+
+# LOCALIZATION NOTE  (saveFile.failed): This is the message displayed when file
+# save fails.
+saveFile.failed=The file save operation failed.
+
+# LOCALIZATION NOTE  (scratchpadIntro): This is a multi-line comment explaining
+# how to use the Scratchpad. Note that this should be a valid JavaScript
+# comment inside /* and */.
+scratchpadIntro=/*\n * This is a JavaScript Scratchpad.\n *\n * Enter some JavaScript, then Right Click or choose from the Execute Menu:\n * 1. Run to evaluate the selected text,\n * 2. Inspect to bring up an Object Inspector on the result, or,\n * 3. Display to insert the result in a comment after the selection.\n */\n\n
--- a/browser/chrome/browser/searchbar.dtd
+++ b/browser/chrome/browser/searchbar.dtd
@@ -1,2 +1,2 @@
-<!ENTITY cmd_engineManager.label "āĻ…āύ⧁āϏāĻ¨ā§āϧāĻžāύ āχāĻžā§āϜāĻŋāύ āĻŦā§āϝāĻŦāĻ¸ā§āĻĨāĻžāĻĒāύāĻž...">
-<!ENTITY searchEndCap.label "āĻ…āύ⧁āϏāĻ¨ā§āϧāĻžāύ">
+<!ENTITY cmd_engineManager.label        "āĻ…āύ⧁āϏāĻ¨ā§āϧāĻžāύ āχāĻžā§āϜāĻŋāύ āĻŦā§āϝāĻŦāĻ¸ā§āĻĨāĻžāĻĒāύāĻž...">
+<!ENTITY searchEndCap.label             "āĻ…āύ⧁āϏāĻ¨ā§āϧāĻžāύ">
--- a/browser/chrome/browser/setDesktopBackground.dtd
+++ b/browser/chrome/browser/setDesktopBackground.dtd
@@ -1,9 +1,9 @@
-<!ENTITY position.label "āĻ…āĻŦāĻ¸ā§āĻĨāĻžāύ:">
-<!ENTITY tile.label "āϟāĻžāϞāĻŋ">
-<!ENTITY center.label "āϕ⧇āĻ¨ā§āĻĻā§āϰ⧇">
-<!ENTITY stretch.label "āĻĒā§āϰāϏāĻžāϰāĻŋāϤ">
-<!ENTITY preview.label "āĻĒā§āϰāĻžāĻ•āĻĻāĻ°ā§āĻļāύ">
-<!ENTITY color.label "āϰāĻ‚:">
+<!ENTITY position.label             "āĻ…āĻŦāĻ¸ā§āĻĨāĻžāύ:">
+<!ENTITY tile.label                 "āϟāĻžāϞāĻŋ">
+<!ENTITY center.label               "āϕ⧇āĻ¨ā§āĻĻā§āϰ⧇">
+<!ENTITY stretch.label              "āĻĒā§āϰāϏāĻžāϰāĻŋāϤ">
+<!ENTITY preview.label              "āĻĒā§āϰāĻžāĻ•āĻĻāĻ°ā§āĻļāύ">
+<!ENTITY color.label                "āϰāĻ‚:">
 <!ENTITY setDesktopBackground.title "āĻĄā§‡āĻ¸ā§āĻ•āϟāĻĒ⧇āϰ āĻĒāϟāĻ­ā§‚āĻŽāĻŋ āύāĻŋāĻ°ā§āϧāĻžāϰāĻŖ">
-<!ENTITY openDesktopPrefs.label "āĻĄā§‡āĻ¸ā§āĻ•āϟāĻĒ āϏāĻ‚āĻ•ā§āϰāĻžāĻ¨ā§āϤ āĻĒāĻ›āĻ¨ā§āĻĻāϏāĻŽā§‚āĻš">
-<!ENTITY closeWindow.key "w">
+<!ENTITY openDesktopPrefs.label     "āĻĄā§‡āĻ¸ā§āĻ•āϟāĻĒ āϏāĻ‚āĻ•ā§āϰāĻžāĻ¨ā§āϤ āĻĒāĻ›āĻ¨ā§āĻĻāϏāĻŽā§‚āĻš">
+<!ENTITY closeWindow.key            "w">
deleted file mode 100644
--- a/browser/chrome/browser/sidebar/sidebar.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-addMicsumGenConfirmTitle=āĻŽāĻžāχāĻ•ā§āϰ⧋āϏāĻžāĻŽāĻžāϰāĻŋ āĻœā§‡āύāĻžāϰ⧇āϟāϰ āϝ⧋āĻ—
-addMicsumGenConfirmText=āύāĻŋāĻŽā§āύāϞāĻŋāĻ–āĻŋāϤ āĻŽāĻžāχāĻ•ā§āϰ⧋āϏāĻžāĻŽāĻžāϰāĻŋ āĻœā§‡āύāĻžāϰ⧇āϟāϰ āϝ⧋āĻ— āĻ•āϰāĻž āĻšāĻŦ⧇ āĻ•āĻŋ?\n\nāĻ‰ā§ŽāϏ: %S
--- a/browser/chrome/browser/syncBrand.dtd
+++ b/browser/chrome/browser/syncBrand.dtd
@@ -1,2 +1,2 @@
-<!ENTITY syncBrand.shortName.label "āϏāĻŋāĻ™ā§āĻ•">
-<!ENTITY syncBrand.fullName.label "āĻĢāĻžā§ŸāĻžāϰāĻĢāĻ•ā§āϏ āϏāĻŋāĻ™ā§āĻ•">
+<!ENTITY syncBrand.shortName.label  "āϏāĻŋāĻ™ā§āĻ•">
+<!ENTITY syncBrand.fullName.label   "āĻĢāĻžā§ŸāĻžāϰāĻĢāĻ•ā§āϏ āϏāĻŋāĻ™ā§āĻ•">
--- a/browser/chrome/browser/syncGenericChange.properties
+++ b/browser/chrome/browser/syncGenericChange.properties
@@ -3,17 +3,17 @@ change.password.title = āφāĻĒāύāĻžāϰ āĻĒāĻžāϏāĻ“ā§ŸāĻžāĻ°ā§āĻĄ āĻĒāϰāĻŋāĻŦāĻ°ā§āϤāύ
 change.password.acceptButton = āĻĒāĻžāϏāĻ“ā§ŸāĻžāĻ°ā§āĻĄ āĻĒāϰāĻŋāĻŦāĻ°ā§āϤāύ
 change.password.status.active = āφāĻĒāύāĻžāϰ āĻĒāĻžāϏāĻ“ā§ŸāĻžāĻ°ā§āĻĄ āĻĒāϰāĻŋāĻŦāĻ°ā§āϤāύâ€Ļ
 change.password.status.success = āφāĻĒāύāĻžāϰ āĻĒāĻžāϏāĻ“ā§ŸāĻžāĻ°ā§āĻĄ āĻĒāϰāĻŋāĻŦāĻ°ā§āϤāύ āĻ•āϰāĻž āĻšā§Ÿā§‡ āĻ—āĻŋā§Ÿā§‡āϛ⧇āĨ¤
 change.password.status.error = āĻĒāĻžāϏāĻ“ā§ŸāĻžāĻ°ā§āĻĄ āĻĒāϰāĻŋāĻŦāĻ°ā§āϤāύ āĻ•āϰāĻžāϰ āϏāĻŽā§Ÿ āĻ¤ā§āϰ⧁āϟāĻŋ āĻ›āĻŋāϞāĨ¤
 
 change.password2.introText = āĻĒāĻžāϏāĻ“ā§ŸāĻžāĻ°ā§āĻĄ āĻ•āĻŽāĻĒāĻ•ā§āώ⧇ ā§Ž āĻ…āĻ•ā§āώāϰ⧇āϰ āĻšāϤ⧇ āĻšāĻŦ⧇āĨ¤ āĻāϟāĻž āĻŦā§āϝāĻŦāĻšāĻžāϰāĻ•āĻžāϰ⧀āϰ āύāĻžāĻŽ āĻŦāĻž āϏāĻŋāĻ™ā§āĻ• āϕ⧀ āĻāϰ āϏāĻžāĻĨ⧇ āĻŽāĻŋāϞāϤ⧇ āĻĒāĻžāϰāĻŦ⧇āύāĻžāĨ¤
 change.password.warningText = āĻŽāύ⧇ āϰāĻžāϖ⧁āύ: āĻāĻ•āĻŦāĻžāϰ āĻĒāĻžāϏāĻ“ā§ŸāĻžāĻ°ā§āĻĄ āĻĒāϰāĻŋāĻŦāĻ°ā§āϤāύ āĻ•āϰāϞ⧇ āφāĻĒāύāĻžāϰ āĻ…ā§āϝāĻžāĻ•āĻžāωāĻ¨ā§āĻŸā§‡āϰ āϏāĻžāĻĨ⧇ āĻ…āĻ¨ā§āϝ āϕ⧋āύ⧋ āĻĄāĻŋāĻ­āĻžāχāϏ āφāϰ āϏāĻ‚āϝ⧁āĻ•ā§āϤ āĻšāϤ⧇ āĻĒāĻžāϰāĻŦ⧇ āύāĻžāĨ¤
 
-change.synckey.title = āϏāĻŋāĻ™ā§āĻ• āϕ⧀ āĻĒāϰāĻŋāĻŦāĻ°ā§āϤāύ
+change.synckey2.title = My Sync Key
 change.synckey.acceptButton = āϏāĻŋāĻ™ā§āĻ• āϕ⧀ āĻĒāϰāĻŋāĻŦāĻ°ā§āϤāύ
 change.synckey.label = āϏāĻŋāĻ™ā§āĻ• āϕ⧀ āĻĒāϰāĻŋāĻŦāĻ°ā§āϤāύ āĻāĻŦāĻ‚ āĻ¸ā§āĻĨāĻžāĻ¨ā§€ā§Ÿ āĻĄāĻžāϟāĻž āφāĻĒāϞ⧋āĻĄ āĻ•āϰāĻž āĻšāĻšā§āϛ⧇, āĻ…āύ⧁āĻ—ā§āϰāĻš āĻ•āϰ⧇ āĻ…āĻĒ⧇āĻ•ā§āώāĻž āĻ•āϰ⧁āύ â€Ļ
 change.synckey2.error = āϏāĻŋāĻ™ā§āĻ• āϕ⧀ āĻĒāϰāĻŋāĻŦāĻ°ā§āϤāύ āĻ•āϰāĻžāϰ āϏāĻŽā§Ÿ āĻ¤ā§āϰ⧁āϟāĻŋ āĻ›āĻŋāϞ!
 change.synckey2.success = āφāĻĒāύāĻžāϰ āϏāĻŋāĻ™ā§āĻ• āϏāĻĢāϞāĻ­āĻžāĻŦ⧇ āĻĒāϰāĻŋāĻŦāĻ°ā§āϤāĻŋāϤ āĻšā§Ÿā§‡āϛ⧇ !
 
 change.synckey.introText = āĻĢāĻžā§ŸāĻžāϰāĻĢāĻ•ā§āϏ āφāĻĒāύāĻžāϰ āύāĻŋāϰāĻžāĻĒāĻ¤ā§āϤāĻžāϰ āĻŦā§āϝāĻžāĻĒāĻžāϰ⧇ āϏāĻšā§‡āϤāύ
 change.synckey.introText2 = āφāĻĒāύāĻžāϰ āϏāĻžāĻ°ā§āĻŦāĻŋāĻ• āĻ—ā§‹āĻĒāĻ¨ā§€ā§ŸāϤāĻž āύāĻŋāĻļā§āϚāĻŋāϤ , āφāĻĒāύāĻžāϰ āϏāĻŦ āĻĄāĻžāϟāĻž āφāĻĒāϞ⧋āĻĄ āĻ•āϰāĻžāϰ āĻĒā§‚āĻ°ā§āĻŦ⧇ āĻāύāĻ•ā§āϰāĻŋāĻĒā§āϟāĻ•ā§ƒāϤ āĻ•āϰ⧇ āĻ¨ā§‡ā§ŸāĻž āĻšā§Ÿā§‡āϛ⧇āĨ¤  āĻĄāĻžāϟāĻž āĻĄāĻŋāĻ•ā§āϰāĻŋāĻĒā§āϟ āĻ•āϰāĻžāϰ āϕ⧀ āφāĻĒāϞ⧋āĻĄ āĻ•āϰāĻž āĻšā§ŸāύāĻŋāĨ¤
 # LOCALIZATION NOTE (change.synckey2.warningText) "Sync" should match &syncBrand.shortName.label; from syncBrand.dtd
--- a/browser/chrome/browser/syncKey.dtd
+++ b/browser/chrome/browser/syncKey.dtd
@@ -1,14 +1,14 @@
-<!ENTITY syncKey.page.title "āφāĻĒāύāĻžāϰ &syncBrand.fullName.label; āϕ⧀">
-<!ENTITY syncKey.page.description "āφāĻĒāύāĻžāϰ &syncBrand.fullName.label; āĻ…ā§āϝāĻžāĻ•āĻžāωāĻ¨ā§āĻŸā§‡ āĻĄāĻžāϟāĻž āĻĄāĻŋāϕ⧋āĻĄ āĻ•āϰāĻžāϰ āϜāĻ¨ā§āϝ āĻ āϕ⧀ āĻŦā§āϝāĻŦāĻšā§ƒāϤ āĻšā§ŸāĨ¤ āφāĻĒāύāĻŋ āύāϤ⧁āύ āϕ⧋āύ⧋ āĻ•āĻŽā§āĻĒāĻŋāωāϟāĻžāϰ āĻŦāĻž āĻĄāĻŋāĻ­āĻžāχāϏ⧇ āϝāϤāĻŦāĻžāϰ syncBrand.fullName.label āĻ•āύāĻĢāĻŋāĻ—āĻžāϰ āĻ•āϰāĻŦ⧇āύ āϤāϤāĻŦāĻžāϰ āĻ āϕ⧀ āĻĻāĻŋāϤ⧇ āĻšāĻŦ⧇āĨ¤">
-<!ENTITY syncKey.keepItSecret.heading "āĻāϟāĻž āĻ—ā§‹āĻĒāύ āϰāĻžāϖ⧁āύ">
+<!ENTITY syncKey.page.title               "āφāĻĒāύāĻžāϰ &syncBrand.fullName.label; āϕ⧀">
+<!ENTITY syncKey.page.description         "āφāĻĒāύāĻžāϰ &syncBrand.fullName.label; āĻ…ā§āϝāĻžāĻ•āĻžāωāĻ¨ā§āĻŸā§‡ āĻĄāĻžāϟāĻž āĻĄāĻŋāϕ⧋āĻĄ āĻ•āϰāĻžāϰ āϜāĻ¨ā§āϝ āĻ āϕ⧀ āĻŦā§āϝāĻŦāĻšā§ƒāϤ āĻšā§ŸāĨ¤ āφāĻĒāύāĻŋ āύāϤ⧁āύ āϕ⧋āύ⧋ āĻ•āĻŽā§āĻĒāĻŋāωāϟāĻžāϰ āĻŦāĻž āĻĄāĻŋāĻ­āĻžāχāϏ⧇ āϝāϤāĻŦāĻžāϰ syncBrand.fullName.label āĻ•āύāĻĢāĻŋāĻ—āĻžāϰ āĻ•āϰāĻŦ⧇āύ āϤāϤāĻŦāĻžāϰ āĻ āϕ⧀ āĻĻāĻŋāϤ⧇ āĻšāĻŦ⧇āĨ¤">
+<!ENTITY syncKey.keepItSecret.heading     "āĻāϟāĻž āĻ—ā§‹āĻĒāύ āϰāĻžāϖ⧁āύ">
 <!ENTITY syncKey.keepItSecret.description "āφāĻĒāύāĻžāϰ āĻ—ā§‹āĻĒāĻ¨ā§€ā§ŸāϤāĻž āϰāĻ•ā§āώāĻž āĻ•āϰāĻžāϰ āϜāĻ¨ā§āϝ &syncBrand.fullName.label; āĻāύāĻ•ā§āϰāĻŋāĻĒā§āϟāĻ•ā§ƒāϤ āĻ•āϰāĻž āĻšā§Ÿā§‡āϛ⧇āĨ¤ āĻ āϕ⧀ āĻ›āĻžā§œāĻž āφāĻĒāύāĻžāϰ āĻŦā§āϝāĻ•ā§āϤāĻŋāĻ—āϤ āϕ⧋āύ⧋ āϤāĻĨā§āϝ āĻĄāĻŋāϕ⧋āĻĄ āĻ•āϰāϤ⧇ āĻ•āĻžāϰāĻ“ āĻŦāĻ›āϰ⧇āϰ āĻĒāϰ āĻŦāĻ›āϰ āϞ⧇āϗ⧇ āϝ⧇āϤ⧇ āĻĒāĻžāϰ⧇āĨ¤ āĻāĻ•āĻŽāĻžāĻ¤ā§āϰ āφāĻĒāύāĻžāϰ āĻ•āĻžāϛ⧇āχ āĻ āϕ⧀ āϟāĻŋ āφāϛ⧇āĨ¤ āϤāĻžāϰ āĻŽāĻžāύ⧇ āĻšāĻšā§āϛ⧇ āφāĻĒāύāĻŋāχ āĻāĻ•āĻŽāĻžāĻ¤ā§āϰ &syncBrand.fullName.label; āĻĄāĻžāϟāĻž āĻŦā§āϝāĻŦāĻšāĻžāϰ āĻ•āϰāϤ⧇ āĻĒāĻžāϰāĻŦ⧇āύāĨ¤">
-<!ENTITY syncKey.keepItSafe.heading "āĻāϟāĻž āύāĻŋāϰāĻžāĻĒāĻĻ āϰāĻžāϖ⧁āύ">
-<!ENTITY syncKey.keepItSafe1.description "āĻāχ āϕ⧀ āĻšāĻžāϰāĻžāĻŦ⧇āύ āύāĻžāĨ¤">
-<!ENTITY syncKey.keepItSafe2.description "āφāĻĒāύāĻžāϰ āĻ•āĻžāϛ⧇ āĻ āϕ⧀ (āϝāĻž āĻāϟāĻž āĻ—ā§‹āĻĒāύ āϰāĻžāĻ–āĻŦ⧇ āύāĻž! )āĻāϰ āϕ⧋āύ⧋ āĻ…āύ⧁āϞāĻŋāĻĒāĻŋ āύ⧇āχ āϤāĻžāχ">
-<!ENTITY syncKey.keepItSafe3.description "āĻāϟāĻž āĻĒ⧁āύāϰ⧂āĻĻā§āϧāĻžāϰ āĻ•āϰāĻžāϰ āĻ•ā§āώ⧇āĻ¤ā§āϰ⧇ āϏāĻšāĻžā§ŸāϤāĻž āĻ•āϰāϤ⧇ āĻĒāĻžāϰāĻŋāύāĻž">
-<!ENTITY syncKey.keepItSafe4.description "āϝāĻĻāĻŋ āĻšāĻžāϰāĻžā§ŸāĨ¤ āφāĻĒāύāĻŋ āϝāĻ–āύāχ &syncBrand.fullName.label; āϕ⧋āύ⧋ āύāϤ⧁āύ āĻ•āĻŽā§āĻĒāĻŋāωāϟāĻžāϰ āĻŦāĻž āĻĄāĻŋāĻ­āĻžāχāϏ⧇ āϏāĻ‚āϝ⧁āĻ•ā§āϤ āĻ•āϰāĻŦ⧇āύ āϤāĻ–āύ āĻ āϕ⧀ āĻĒā§āĻ°ā§Ÿā§‹āϜāύāĨ¤">
-<!ENTITY syncKey.findOutMore1.label "&syncBrand.fullName.label; āĻāĻŦāĻ‚ āφāĻĒāύāĻžāϰ āĻ—ā§‹āĻĒāĻ¨ā§€ā§ŸāϤāĻž āϏāĻŽā§āĻĒāĻ°ā§āϕ⧇ āφāϰāĻ“ āϜāĻžāύāϤ⧇ ">
-<!ENTITY syncKey.findOutMore2.label ".">
-<!ENTITY syncKey.footer1.label "&syncBrand.fullName.label; āĻĒāϰāĻŋāϏ⧇āĻŦāĻžāϰ āĻļāĻ°ā§āϤāĻžāĻŦāϞ⧀ āĻĒāĻžāĻ“ā§ŸāĻž āϝāĻžā§Ÿ ">
-<!ENTITY syncKey.footer2.label ".  āĻ—ā§‹āĻĒāĻ¨ā§€ā§ŸāϤāĻž āύ⧀āϤāĻŋ āĻĒāĻžāĻ“ā§ŸāĻž āϝāĻžā§Ÿ">
-<!ENTITY syncKey.footer3.label ".">
+<!ENTITY syncKey.keepItSafe.heading       "āĻāϟāĻž āύāĻŋāϰāĻžāĻĒāĻĻ āϰāĻžāϖ⧁āύ">
+<!ENTITY syncKey.keepItSafe1.description  "āĻāχ āϕ⧀ āĻšāĻžāϰāĻžāĻŦ⧇āύ āύāĻžāĨ¤">
+<!ENTITY syncKey.keepItSafe2.description  "āφāĻĒāύāĻžāϰ āĻ•āĻžāϛ⧇ āĻ āϕ⧀ (āϝāĻž āĻāϟāĻž āĻ—ā§‹āĻĒāύ āϰāĻžāĻ–āĻŦ⧇ āύāĻž! )āĻāϰ āϕ⧋āύ⧋ āĻ…āύ⧁āϞāĻŋāĻĒāĻŋ āύ⧇āχ āϤāĻžāχ">
+<!ENTITY syncKey.keepItSafe3.description  "āĻāϟāĻž āĻĒ⧁āύāϰ⧂āĻĻā§āϧāĻžāϰ āĻ•āϰāĻžāϰ āĻ•ā§āώ⧇āĻ¤ā§āϰ⧇ āϏāĻšāĻžā§ŸāϤāĻž āĻ•āϰāϤ⧇ āĻĒāĻžāϰāĻŋāύāĻž">
+<!ENTITY syncKey.keepItSafe4.description  "āϝāĻĻāĻŋ āĻšāĻžāϰāĻžā§ŸāĨ¤ āφāĻĒāύāĻŋ āϝāĻ–āύāχ &syncBrand.fullName.label; āϕ⧋āύ⧋ āύāϤ⧁āύ āĻ•āĻŽā§āĻĒāĻŋāωāϟāĻžāϰ āĻŦāĻž āĻĄāĻŋāĻ­āĻžāχāϏ⧇ āϏāĻ‚āϝ⧁āĻ•ā§āϤ āĻ•āϰāĻŦ⧇āύ āϤāĻ–āύ āĻ āϕ⧀ āĻĒā§āĻ°ā§Ÿā§‹āϜāύāĨ¤">
+<!ENTITY syncKey.findOutMore1.label       "&syncBrand.fullName.label; āĻāĻŦāĻ‚ āφāĻĒāύāĻžāϰ āĻ—ā§‹āĻĒāĻ¨ā§€ā§ŸāϤāĻž āϏāĻŽā§āĻĒāĻ°ā§āϕ⧇ āφāϰāĻ“ āϜāĻžāύāϤ⧇ ">
+<!ENTITY syncKey.findOutMore2.label       ".">
+<!ENTITY syncKey.footer1.label            "&syncBrand.fullName.label; āĻĒāϰāĻŋāϏ⧇āĻŦāĻžāϰ āĻļāĻ°ā§āϤāĻžāĻŦāϞ⧀ āĻĒāĻžāĻ“ā§ŸāĻž āϝāĻžā§Ÿ ">
+<!ENTITY syncKey.footer2.label            ".  āĻ—ā§‹āĻĒāĻ¨ā§€ā§ŸāϤāĻž āύ⧀āϤāĻŋ āĻĒāĻžāĻ“ā§ŸāĻž āϝāĻžā§Ÿ">
+<!ENTITY syncKey.footer3.label            ".">
--- a/browser/chrome/browser/syncQuota.dtd
+++ b/browser/chrome/browser/syncQuota.dtd
@@ -1,4 +1,4 @@
-<!ENTITY quota.dialogTitle.label "āϏāĻžāĻ°ā§āĻ­āĻžāϰ āϕ⧋āϟāĻž">
+<!ENTITY quota.dialogTitle.label    "āϏāĻžāĻ°ā§āĻ­āĻžāϰ āϕ⧋āϟāĻž">
 <!ENTITY quota.retrievingInfo.label "āϕ⧋āϟāĻž āϏāĻŽā§āĻĒāĻ°ā§āĻ•āĻŋāϤ āϤāĻĨā§āϝ āĻĒ⧁āύāϰ⧂āĻĻā§āϧāĻžāϰâ€Ļ">
-<!ENTITY quota.typeColumn.label "āϧāϰāĻŖ">
-<!ENTITY quota.sizeColumn.label "āφāĻ•āĻžāϰ">
+<!ENTITY quota.typeColumn.label     "āϧāϰāĻŖ">
+<!ENTITY quota.sizeColumn.label     "āφāĻ•āĻžāϰ">
--- a/browser/chrome/browser/syncSetup.dtd
+++ b/browser/chrome/browser/syncSetup.dtd
@@ -1,108 +1,108 @@
-<!ENTITY accountSetupTitle.label "&syncBrand.fullName.label; āϏ⧇āϟāφāĻĒ">
+<!ENTITY accountSetupTitle.label    "&syncBrand.fullName.label; āϏ⧇āϟāφāĻĒ">
 <!-- First page of the wizard -->
 
 
 <!ENTITY setup.pickSetupType.description "āĻ¸ā§āĻŦāĻžāĻ—āϤāĻŽ, āφāĻĒāύāĻŋ āĻĒā§‚āĻ°ā§āĻŦ⧇ āĻ•āĻ–āύāĻ“ &syncBrand.fullName.label; āĻŦā§āϝāĻŦāĻšāĻžāϰ āĻ•āϰ⧇āύāύāĻŋ, āφāĻĒāύāĻžāϰ āύāϤ⧁āύ āĻ…ā§āϝāĻžāĻ•āĻžāωāĻ¨ā§āϟ āϤ⧈āϰāĻŋ āĻ•āϰāĻž āĻĻāϰāĻ•āĻžāϰāĨ¤">
 <!ENTITY button.createNewAccount.label "āύāϤ⧁āύ āĻ…ā§āϝāĻžāĻ•āĻžāωāĻ¨ā§āϟ āϤ⧈āϰāĻŋ">
 <!ENTITY setup.haveAccount.label "āφāĻŽāĻžāϰ āχāϤ⧋āĻŽāĻ§ā§āϝ⧇ &syncBrand.fullName.label; āĻ…ā§āϝāĻžāĻ•āĻžāωāĻ¨ā§āϟ āĻ°ā§Ÿā§‡āϛ⧇āĨ¤">
-<!ENTITY button.connect.label "āϏāĻ‚āϝ⧁āĻ•ā§āϤ">
+<!ENTITY button.connect.label    "āϏāĻ‚āϝ⧁āĻ•ā§āϤ">
 
-<!ENTITY setup.choicePage.title.label "āĻĒā§‚āĻ°ā§āĻŦ⧇ &syncBrand.fullName.label; āĻŦā§āϝāĻŦāĻšāĻžāϰ āĻ•āϰ⧇āϛ⧇āύ?">
-<!ENTITY setup.choicePage.new.label "āĻĒā§‚āĻ°ā§āĻŦ⧇ &syncBrand.shortName.label; āĻŦā§āϝāĻŦāĻšāĻžāϰ āĻ•āϰāĻŋāύāĻŋ">
-<!ENTITY setup.choicePage.existing.label "āφāĻŽāĻŋ āχāϤ⧋āĻŽāĻ§ā§āϝ⧇ āĻ…āĻ¨ā§āϝ āĻ•āĻŽā§āĻĒāĻŋāωāϟāĻžāϰ⧇ &syncBrand.shortName.label; āĻŦā§āϝāĻŦāĻšāĻžāϰ āĻ•āϰāĻ›āĻŋ">
+<!ENTITY setup.choicePage.title.label     "āĻĒā§‚āĻ°ā§āĻŦ⧇ &syncBrand.fullName.label; āĻŦā§āϝāĻŦāĻšāĻžāϰ āĻ•āϰ⧇āϛ⧇āύ?">
+<!ENTITY setup.choicePage.new.label       "āĻĒā§‚āĻ°ā§āĻŦ⧇ &syncBrand.shortName.label; āĻŦā§āϝāĻŦāĻšāĻžāϰ āĻ•āϰāĻŋāύāĻŋ">
+<!ENTITY setup.choicePage.existing.label  "āφāĻŽāĻŋ āχāϤ⧋āĻŽāĻ§ā§āϝ⧇ āĻ…āĻ¨ā§āϝ āĻ•āĻŽā§āĻĒāĻŋāωāϟāĻžāϰ⧇ &syncBrand.shortName.label; āĻŦā§āϝāĻŦāĻšāĻžāϰ āĻ•āϰāĻ›āĻŋ">
 <!-- New Account AND Existing Account -->
 
-<!ENTITY server.label "āϏāĻžāĻ°ā§āĻ­āĻžāϰ">
-<!ENTITY serverType.main.label "&syncBrand.fullName.label; āϏāĻžāĻ°ā§āĻ­āĻžāϰ">
-<!ENTITY serverType.custom2.label "āĻ¸ā§āĻŦāύāĻŋāĻ°ā§āϧāĻžāϰāĻŋāϤ āϏāĻžāĻ°ā§āĻ­āĻžāϰ āĻŦā§āϝāĻŦāĻšāĻžāϰâ€Ļ">
-<!ENTITY signIn.account2.label "āĻ…ā§āϝāĻžāĻ•āĻžāωāĻ¨ā§āϟ (A)">
-<!ENTITY signIn.account2.accesskey "A">
-<!ENTITY signIn.password.label "āĻĒāĻžāϏāĻ“ā§ŸāĻžāĻ°ā§āĻĄ (P)">
-<!ENTITY signIn.password.accesskey "P">
-<!ENTITY signIn.syncKey.label "āϏāĻŋāĻ™ā§āĻ• āϕ⧀ (K)">
-<!ENTITY signIn.syncKey.accesskey "K">
+<!ENTITY server.label               "āϏāĻžāĻ°ā§āĻ­āĻžāϰ">
+<!ENTITY serverType.main.label      "&syncBrand.fullName.label; āϏāĻžāĻ°ā§āĻ­āĻžāϰ">
+<!ENTITY serverType.custom2.label   "āĻ¸ā§āĻŦāύāĻŋāĻ°ā§āϧāĻžāϰāĻŋāϤ āϏāĻžāĻ°ā§āĻ­āĻžāϰ āĻŦā§āϝāĻŦāĻšāĻžāϰâ€Ļ">
+<!ENTITY signIn.account2.label      "āĻ…ā§āϝāĻžāĻ•āĻžāωāĻ¨ā§āϟ (A)">
+<!ENTITY signIn.account2.accesskey  "A">
+<!ENTITY signIn.password.label      "āĻĒāĻžāϏāĻ“ā§ŸāĻžāĻ°ā§āĻĄ (P)">
+<!ENTITY signIn.password.accesskey  "P">
+<!ENTITY signIn.syncKey.label       "āϏāĻŋāĻ™ā§āĻ• āϕ⧀ (K)">
+<!ENTITY signIn.syncKey.accesskey   "K">
 <!-- New Account Page 1: Basic Account Info -->
 
 <!ENTITY setup.newAccountDetailsPage.title.label "āĻ…ā§āϝāĻžāĻ•āĻžāωāĻ¨ā§āĻŸā§‡āϰ āĻŦāĻŋāĻ¸ā§āϤāĻžāϰāĻŋāϤ āϤāĻĨā§āϝ">
-<!ENTITY setup.confirmPassword.label "āĻĒāĻžāϏāĻ“ā§ŸāĻžāĻ°ā§āĻĄ āύāĻŋāĻļā§āϚāĻŋāϤ (m)">
-<!ENTITY setup.confirmPassword.accesskey "m">
-<!ENTITY setup.emailAddress.label "āχāĻŽā§‡āχāϞ āĻ āĻŋāĻ•āĻžāύāĻž (E)">
+<!ENTITY setup.confirmPassword.label  "āĻĒāĻžāϏāĻ“ā§ŸāĻžāĻ°ā§āĻĄ āύāĻŋāĻļā§āϚāĻŋāϤ (m)">
+<!ENTITY setup.confirmPassword.accesskey  "m">
+<!ENTITY setup.emailAddress.label     "āχāĻŽā§‡āχāϞ āĻ āĻŋāĻ•āĻžāύāĻž (E)">
 <!ENTITY setup.emailAddress.accesskey "E">
 <!-- LOCALIZATION NOTE: tosAgree1, tosLink, tosAgree2, ppLink, tosAgree3 are
      joined with implicit white space, so spaces in the strings aren't necessary -->
-<!ENTITY setup.tosAgree1.label "āφāĻŽāĻŋ āϏāĻŽā§āĻŽāϤ (a)">
-<!ENTITY setup.tosAgree1.accesskey "a">
-<!ENTITY setup.tosLink.label "āϏ⧇āĻŦāĻžāϰ āĻļāĻ°ā§āϤ">
-<!ENTITY setup.tosAgree2.label "āĻāĻŦāĻ‚">
-<!ENTITY setup.ppLink.label " āĻ—ā§‹āĻĒāĻ¨ā§€ā§ŸāϤāĻž āύ⧀āϤāĻŋ">
-<!ENTITY setup.tosAgree3.label "">
-<!ENTITY setup.tosAgree2.accesskey "">
+<!ENTITY setup.tosAgree1.label      "āφāĻŽāĻŋ āϏāĻŽā§āĻŽāϤ (a)">
+<!ENTITY setup.tosAgree1.accesskey  "a">
+<!ENTITY setup.tosLink.label        "āϏ⧇āĻŦāĻžāϰ āĻļāĻ°ā§āϤ">
+<!ENTITY setup.tosAgree2.label      "āĻāĻŦāĻ‚">
+<!ENTITY setup.ppLink.label         " āĻ—ā§‹āĻĒāĻ¨ā§€ā§ŸāϤāĻž āύ⧀āϤāĻŋ">
+<!ENTITY setup.tosAgree3.label      "">
+<!ENTITY setup.tosAgree2.accesskey  "">
 <!-- New Account Page 2: Sync Key -->
 
 <!ENTITY setup.newSyncKeyPage.title.label "&brandShortName; āφāĻĒāύāĻžāϰ āĻ—ā§‹āĻĒāĻ¨ā§€ā§ŸāϤāĻž āϰāĻ•ā§āώāĻžāϰ āĻŦā§āϝāĻžāĻĒāĻžāϰ⧇ āϏāĻšā§‡āϤāύ">
 <!ENTITY setup.newSyncKeyPage.description.label "āφāĻĒāύāĻžāϰ āϏāĻžāĻ°ā§āĻŦāĻŋāĻ• āĻ—ā§‹āĻĒāĻ¨ā§€ā§ŸāϤāĻž āύāĻŋāĻļā§āϚāĻŋāϤ āĻ•āϰāϤ⧇, āφāĻĒāύāĻžāϰ āϏāĻŦ āĻĄāĻžāϟāĻž āφāĻĒāϞ⧋āĻĄ āĻ•āϰāĻžāϰ āφāϗ⧇ āĻāύāĻ•ā§āϰāĻŋāĻĒā§āϟāĻ•ā§ƒāϤ āĻ•āϰāĻž āĻšā§ŸāĨ¤ āĻĄāĻžāϟāĻž āĻĄāĻŋāĻ•ā§āϰāĻŋāĻĒā§āϟ āĻ•āϰāĻžāϰ āĻĒā§āĻ°ā§Ÿā§‹āϜāĻ¨ā§€ā§Ÿ āϏāĻŋāĻ™ā§āĻ• āϕ⧀ āφāĻĒāϞ⧋āĻĄ āĻ•āϰāĻž āĻšā§ŸāύāĻŋāĨ¤">
-<!ENTITY syncKeyEntry.label "āφāĻĒāύāĻžāϰ āϏāĻŋāĻ™ā§āĻ• āϕ⧀ (K)">
-<!ENTITY syncKeyEntry.accesskey "K">
-<!ENTITY syncKeyGenerate.label "āϤ⧈āϰāĻŋ āĻ•āϰāĻž">
+<!ENTITY syncKeyEntry.label        "āφāĻĒāύāĻžāϰ āϏāĻŋāĻ™ā§āĻ• āϕ⧀ (K)">
+<!ENTITY syncKeyEntry.accesskey    "K">
+<!ENTITY syncGenerateNewKey.label  "Generate a new key">
 <!ENTITY syncKeyBackup.description "āĻ…āĻ¨ā§āϝāĻžāĻ¨ā§āϝ āĻŽā§‡āĻļāĻŋāύ⧇ &syncBrand.fullName.label;āĻ āϏāĻŋāĻ™ā§āĻ• āϕ⧀ āĻĻā§‡ā§ŸāĻž āφāĻŦāĻļā§āϝāĻ•āĨ¤ āĻ…āύ⧁āĻ—ā§āϰāĻš āĻ•āϰ⧇ āĻāĻ•āϟāĻŋ āĻŦā§āϝāĻžāĻ•āφāĻĒ āĻ•āĻĒāĻŋ āϤ⧈āϰāĻŋ āĻ•āϰ⧁āύāĨ¤ āφāĻŽāϰāĻž āφāĻĒāύāĻžāϰ āϏāĻŋāĻ™ā§āĻ• āϕ⧀ āĻĒ⧁āύāϰ⧂āĻĻā§āϧāĻžāϰ āĻ•āϰāĻžāϰ āĻŦā§āϝāĻžāĻĒāĻžāϰ⧇ āϏāĻšāĻžā§ŸāϤāĻž āĻ•āϰāϤ⧇ āĻĒāĻžāϰāĻŋāύāĻžāĨ¤">
 
-<!ENTITY button.syncKeyBackup.print.label "āĻŽā§āĻĻā§āϰāĻŖâ€Ļ (P)">
+<!ENTITY button.syncKeyBackup.print.label     "āĻŽā§āĻĻā§āϰāĻŖâ€Ļ (P)">
 <!ENTITY button.syncKeyBackup.print.accesskey "P">
-<!ENTITY button.syncKeyBackup.save.label "āϏāĻ‚āϰāĻ•ā§āώāύâ€Ļ (S)">
-<!ENTITY button.syncKeyBackup.save.accesskey "S">
+<!ENTITY button.syncKeyBackup.save.label      "āϏāĻ‚āϰāĻ•ā§āώāύâ€Ļ (S)">
+<!ENTITY button.syncKeyBackup.save.accesskey  "S">
 <!-- New Account Page 3: Captcha -->
 
-<!ENTITY setup.captchaPage2.title.label "āĻ…āύ⧁āĻ—ā§āϰāĻš āĻ•āϰ⧇ āύāĻŋāĻļā§āϚāĻŋāϤ āĻšā§‹āύ āϝ⧇ āφāĻĒāύāĻŋ āϕ⧋āύ⧋ āϰ⧋āĻŦāϟ āύāύ">
+<!ENTITY setup.captchaPage2.title.label     "āĻ…āύ⧁āĻ—ā§āϰāĻš āĻ•āϰ⧇ āύāĻŋāĻļā§āϚāĻŋāϤ āĻšā§‹āύ āϝ⧇ āφāĻĒāύāĻŋ āϕ⧋āύ⧋ āϰ⧋āĻŦāϟ āύāύ">
 <!-- Existing Account Page 1: Add Device (incl. Add a Device dialog strings) -->
-<!ENTITY addDevice.title.label "āĻĄāĻŋāĻ­āĻžāχāϏ āϝ⧋āĻ—">
-<!ENTITY addDevice.showMeHow.label "āĻ•āĻŋāĻ­āĻžāĻŦ⧇ āĻ•āϰāĻž āĻšāĻŦ⧇ āϤāĻž āφāĻŽāĻžāϕ⧇ āĻĻ⧇āĻ–āĻŋā§Ÿā§‡ āĻĻāĻŋāύāĨ¤">
-<!ENTITY addDevice.dontHaveDevice.label "āφāĻŽāĻžāϰ āĻ•āĻžāϛ⧇ āĻĄāĻŋāĻ­āĻžāχāϏāϟāĻŋ āύ⧇āχ">
-<!ENTITY addDevice.setup.description.label "āϏāĻ•ā§āϰāĻŋ⧟ āĻ•āϰāϤ⧇, āĻ…āĻ¨ā§āϝāĻžāĻ¨ā§āϝ āĻĄāĻŋāĻ­āĻžāχāϏ⧇āϰ &syncBrand.shortName.label; āĻ āϝāĻžāύ āĻāĻŦāĻ‚ &#x0022; āύāĻŋāĻ°ā§āĻŦāĻžāϚāύ āĻ•āϰ⧁āύ;&#x0022;āĻĄāĻŋāĻ­āĻžāχāϏ āϝ⧋āĻ—āĨ¤ ">
-<!ENTITY addDevice.setup.enterCode.label "āϤāĻžāϰāĻĒāϰ, āĻ āϕ⧋āĻĄ āĻĻāĻŋāύ:">
+<!ENTITY addDevice.title.label              "āĻĄāĻŋāĻ­āĻžāχāϏ āϝ⧋āĻ—">
+<!ENTITY addDevice.showMeHow.label          "āĻ•āĻŋāĻ­āĻžāĻŦ⧇ āĻ•āϰāĻž āĻšāĻŦ⧇ āϤāĻž āφāĻŽāĻžāϕ⧇ āĻĻ⧇āĻ–āĻŋā§Ÿā§‡ āĻĻāĻŋāύāĨ¤">
+<!ENTITY addDevice.dontHaveDevice.label     "āφāĻŽāĻžāϰ āĻ•āĻžāϛ⧇ āĻĄāĻŋāĻ­āĻžāχāϏāϟāĻŋ āύ⧇āχ">
+<!ENTITY addDevice.setup.description.label  "āϏāĻ•ā§āϰāĻŋ⧟ āĻ•āϰāϤ⧇, āĻ…āĻ¨ā§āϝāĻžāĻ¨ā§āϝ āĻĄāĻŋāĻ­āĻžāχāϏ⧇āϰ &syncBrand.shortName.label; āĻ āϝāĻžāύ āĻāĻŦāĻ‚ &#x0022; āύāĻŋāĻ°ā§āĻŦāĻžāϚāύ āĻ•āϰ⧁āύ;&#x0022;āĻĄāĻŋāĻ­āĻžāχāϏ āϝ⧋āĻ—āĨ¤ ">
+<!ENTITY addDevice.setup.enterCode.label    "āϤāĻžāϰāĻĒāϰ, āĻ āϕ⧋āĻĄ āĻĻāĻŋāύ:">
 <!ENTITY addDevice.dialog.description.label "āύāϤ⧁āύ āĻĄāĻŋāĻ­āĻžāχāϏ āϏāĻ•ā§āϰāĻŋ⧟ āĻ•āϰāϤ⧇, āĻĄāĻŋāĻ­āĻžāχāϏ⧇āϰ &syncBrand.shortName.label; āĻ…āĻĒāĻļāύ⧇ āϝāĻžāύ āĻāĻŦāĻ‚ &#x0022;āύāĻŋāĻ°ā§āĻŦāĻžāϚāύ āĻ•āϰ⧁āύ.&#x0022;āĻ āϏāĻ‚āϝ⧁āĻ•ā§āϤ āĻšā§‹āύ;">
-<!ENTITY addDevice.dialog.enterCode.label "āĻĄāĻŋāĻ­āĻžāχāϏ⧇ āϏāϰāĻŦāϰāĻžāĻšāĻ•ā§ƒāϤ āϕ⧋āĻĄ āĻĻāĻŋāύ:">
-<!ENTITY addDevice.dialog.tryAgain.label "āĻ…āύ⧁āĻ—ā§āϰāĻš āĻ•āϰ⧇ āĻĒ⧁āύāϰāĻžā§Ÿ āĻšā§‡āĻˇā§āϟāĻž āĻ•āϰ⧁āύāĨ¤">
-<!ENTITY addDevice.dialog.successful.label "āĻĄāĻŋāĻ­āĻžāχāϏ āϏāĻĢāϞāĻ­āĻžāĻŦ⧇ āϝ⧋āĻ— āĻ•āϰāĻž āĻšā§Ÿā§‡āϛ⧇āĨ¤ āĻĒā§āϰāĻžāĻĨāĻŽāĻŋāĻ• āĻ…āĻ­āĻŋāĻ¨ā§āύāĻ•āϰāĻŖ āĻ•āϰāϤ⧇ āĻ•ā§Ÿā§‡āĻ•āĻŽāĻŋāύāĻŋāϟ āϏāĻŽā§Ÿ āϞāĻžāĻ—āĻŦ⧇ āĻāĻŦāĻ‚ āĻĒāϟāĻ­ā§‚āĻŽāĻŋāϤ⧇āχ āφāĻŽāϰāĻž āĻāϟāĻž āϏāĻŽā§āĻĒāĻ¨ā§āύ āĻ•āϰ⧇ āύāĻŋāĻŦāĨ¤...">
-<!ENTITY addDevice.dialog.syncKey.label "āĻĄāĻŋāĻ­āĻžāχāϏ āϏāĻ•ā§āϰāĻŋ⧟ āĻ•āϰāĻžāϰ āϜāĻ¨ā§āϝ āϏāĻŋāĻ™ā§āĻ• āϕ⧀ āĻĻāĻŋāϤ⧇ āĻšāĻŦ⧇āĨ¤ āĻ…āύ⧁āĻ—ā§āϰāĻš āĻ•āϰ⧇ āĻ āϕ⧀ āϟāĻŋ āĻŽā§āĻĻā§āϰāĻŖ āĻ•āϰ⧇ āĻŦāĻž āϏāĻ‚āϰāĻ•ā§āώāύ āĻ•āϰ⧇ āύāĻŋāĻœā§‡āϰ āĻ•āĻžāϛ⧇ āϰ⧇āϖ⧇ āĻĻāĻŋāύāĨ¤">
-<!ENTITY addDevice.dialog.connected.label "āĻĄāĻŋāĻ­āĻžāχāϏ āϏāĻ‚āϝ⧁āĻ•ā§āϤ">
+<!ENTITY addDevice.dialog.enterCode.label   "āĻĄāĻŋāĻ­āĻžāχāϏ⧇ āϏāϰāĻŦāϰāĻžāĻšāĻ•ā§ƒāϤ āϕ⧋āĻĄ āĻĻāĻŋāύ:">
+<!ENTITY addDevice.dialog.tryAgain.label    "āĻ…āύ⧁āĻ—ā§āϰāĻš āĻ•āϰ⧇ āĻĒ⧁āύāϰāĻžā§Ÿ āĻšā§‡āĻˇā§āϟāĻž āĻ•āϰ⧁āύāĨ¤">
+<!ENTITY addDevice.dialog.successful.label  "āĻĄāĻŋāĻ­āĻžāχāϏ āϏāĻĢāϞāĻ­āĻžāĻŦ⧇ āϝ⧋āĻ— āĻ•āϰāĻž āĻšā§Ÿā§‡āϛ⧇āĨ¤ āĻĒā§āϰāĻžāĻĨāĻŽāĻŋāĻ• āĻ…āĻ­āĻŋāĻ¨ā§āύāĻ•āϰāĻŖ āĻ•āϰāϤ⧇ āĻ•ā§Ÿā§‡āĻ•āĻŽāĻŋāύāĻŋāϟ āϏāĻŽā§Ÿ āϞāĻžāĻ—āĻŦ⧇ āĻāĻŦāĻ‚ āĻĒāϟāĻ­ā§‚āĻŽāĻŋāϤ⧇āχ āφāĻŽāϰāĻž āĻāϟāĻž āϏāĻŽā§āĻĒāĻ¨ā§āύ āĻ•āϰ⧇ āύāĻŋāĻŦāĨ¤...">
+<!ENTITY addDevice.dialog.syncKey.label     "āĻĄāĻŋāĻ­āĻžāχāϏ āϏāĻ•ā§āϰāĻŋ⧟ āĻ•āϰāĻžāϰ āϜāĻ¨ā§āϝ āϏāĻŋāĻ™ā§āĻ• āϕ⧀ āĻĻāĻŋāϤ⧇ āĻšāĻŦ⧇āĨ¤ āĻ…āύ⧁āĻ—ā§āϰāĻš āĻ•āϰ⧇ āĻ āϕ⧀ āϟāĻŋ āĻŽā§āĻĻā§āϰāĻŖ āĻ•āϰ⧇ āĻŦāĻž āϏāĻ‚āϰāĻ•ā§āώāύ āĻ•āϰ⧇ āύāĻŋāĻœā§‡āϰ āĻ•āĻžāϛ⧇ āϰ⧇āϖ⧇ āĻĻāĻŋāύāĨ¤">
+<!ENTITY addDevice.dialog.connected.label   "āĻĄāĻŋāĻ­āĻžāχāϏ āϏāĻ‚āϝ⧁āĻ•ā§āϤ">
 <!-- Existing Account Page 2: Manual Login -->
 
 <!ENTITY setup.signInPage.title.label "āϏāĻžāχāύ āχāύ">
 <!ENTITY existingSyncKey.description "āφāĻĒāύāĻŋ āĻ…āĻ¨ā§āϝāĻžāĻ¨ā§āϝ āĻĄāĻŋāĻ­āĻžāχāϏ⧇ &syncBrand.shortName.label; āĻ…āĻĒāĻļāύ⧇ āĻ—āĻŋā§Ÿā§‡ āĻāĻŦāĻ‚ &#x0022;āφāĻŽāĻžāϰ āϏāĻŋāĻ™ā§āĻ• āϕ⧀&#x0022; āĻāϰ āφāĻ“āϤāĻžā§Ÿ &#x0022;āĻ…ā§āϝāĻžāĻ•āĻžāωāĻ¨ā§āϟ āĻŦā§āϝāĻŦāĻ¸ā§āĻĨāĻžāĻĒāύāĻž&#x0022; āύāĻŋāĻ°ā§āĻŦāĻžāϚāύ āĻ•āϰ⧇ āφāĻĒāύāĻžāϰ āϏāĻŋāĻ™ā§āĻ• āϕ⧀ āĻ…āύ⧁āϞāĻŋāĻĒāĻŋ āĻ•āϰāϤ⧇ āĻĒāĻžāϰ⧇āύāĨ¤">
-<!ENTITY verifying.label "āĻĒāϰ⧀āĻ•ā§āώāĻž āĻ•āϰāĻž āĻšāĻšā§āϛ⧇â€Ļ">
-<!ENTITY resetPassword.label "āĻĒāĻžāϏāĻ“ā§ŸāĻžāĻ°ā§āĻĄ āĻĒ⧁āύāσāύāĻŋāĻ°ā§āϧāĻžāϰāĻŖ">
-<!ENTITY resetSyncKey.label "I have lost my other device.">
+<!ENTITY verifying.label              "āĻĒāϰ⧀āĻ•ā§āώāĻž āĻ•āϰāĻž āĻšāĻšā§āϛ⧇â€Ļ">
+<!ENTITY resetPassword.label          "āĻĒāĻžāϏāĻ“ā§ŸāĻžāĻ°ā§āĻĄ āĻĒ⧁āύāσāύāĻŋāĻ°ā§āϧāĻžāϰāĻŖ">
+<!ENTITY resetSyncKey.label           "I have lost my other device.">
 <!-- Sync Options -->
 
-<!ENTITY setup.optionsPage.title "āϏāĻŋāĻ™ā§āĻ• āĻ…āĻĒāĻļāύ">
-<!ENTITY syncComputerName.label "āĻ•āĻŽā§āĻĒāĻŋāωāϟāĻžāϰ⧇āϰ āύāĻžāĻŽ: (C)">
-<!ENTITY syncComputerName.accesskey "C">
+<!ENTITY setup.optionsPage.title      "āϏāĻŋāĻ™ā§āĻ• āĻ…āĻĒāĻļāύ">
+<!ENTITY syncComputerName.label       "āĻ•āĻŽā§āĻĒāĻŋāωāϟāĻžāϰ⧇āϰ āύāĻžāĻŽ: (C)">
+<!ENTITY syncComputerName.accesskey   "C">
 
-<!ENTITY syncMy.label "āφāĻŽāĻžāϰ āϏāĻŋāĻ™ā§āĻ•">
-<!ENTITY engine.bookmarks.label "āĻŦ⧁āĻ•āĻŽāĻžāĻ°ā§āĻ• (m)">
+<!ENTITY syncMy.label               "āφāĻŽāĻžāϰ āϏāĻŋāĻ™ā§āĻ•">
+<!ENTITY engine.bookmarks.label     "āĻŦ⧁āĻ•āĻŽāĻžāĻ°ā§āĻ• (m)">
 <!ENTITY engine.bookmarks.accesskey "m">
-<!ENTITY engine.tabs.label "āĻŸā§āϝāĻžāĻŦ (T)">
-<!ENTITY engine.tabs.accesskey "T">
-<!ENTITY engine.history.label "āχāϤāĻŋāĻšāĻžāϏ (r)">
-<!ENTITY engine.history.accesskey "r">
-<!ENTITY engine.passwords.label "āĻĒāĻžāϏāĻ“ā§ŸāĻžāĻ°ā§āĻĄ (P)">
+<!ENTITY engine.tabs.label          "āĻŸā§āϝāĻžāĻŦ (T)">
+<!ENTITY engine.tabs.accesskey      "T">
+<!ENTITY engine.history.label       "āχāϤāĻŋāĻšāĻžāϏ (r)">
+<!ENTITY engine.history.accesskey   "r">
+<!ENTITY engine.passwords.label     "āĻĒāĻžāϏāĻ“ā§ŸāĻžāĻ°ā§āĻĄ (P)">
 <!ENTITY engine.passwords.accesskey "P">
-<!ENTITY engine.prefs.label "āĻĒāĻ›āĻ¨ā§āĻĻāϏāĻŽā§‚āĻš (s)">
-<!ENTITY engine.prefs.accesskey "s">
+<!ENTITY engine.prefs.label         "āĻĒāĻ›āĻ¨ā§āĻĻāϏāĻŽā§‚āĻš (s)">
+<!ENTITY engine.prefs.accesskey     "s">
 
-<!ENTITY choice2.merge.main.label "&syncBrand.shortName.label; āĻĄāĻžāϟāĻžāϰ āϏāĻžāĻĨ⧇ āĻ•āĻŽā§āĻĒāĻŋāωāϟāĻžāϰ⧇ āĻĄāĻžāϟāĻž āĻāĻ•āĻ¤ā§āϰ⧀āĻ•āϰāĻŖ">
+<!ENTITY choice2.merge.main.label      "&syncBrand.shortName.label; āĻĄāĻžāϟāĻžāϰ āϏāĻžāĻĨ⧇ āĻ•āĻŽā§āĻĒāĻŋāωāϟāĻžāϰ⧇ āĻĄāĻžāϟāĻž āĻāĻ•āĻ¤ā§āϰ⧀āĻ•āϰāĻŖ">
 <!ENTITY choice2.merge.recommended.label "āϏ⧁āĻĒāĻžāϰāĻŋāĻļāĻ•ā§ƒāϤ:">
-<!ENTITY choice2.client.main.label "&syncBrand.shortName.label; āĻĻā§āĻŦāĻžāϰāĻž āĻ•āĻŽā§āĻĒāĻŋāωāϟāĻžāϰ⧇āϰ āϏāĻŦ āĻĄāĻžāϟāĻž āĻĒā§āϰāϤāĻŋāĻ¸ā§āĻĨāĻžāĻĒāύ">
-<!ENTITY choice2.server.main.label "āĻ•āĻŽā§āĻĒāĻŋāωāϟāĻžāϰ⧇āϰ āĻĄāĻžāϟāĻž āĻĻā§āĻŦāĻžāϰāĻž āĻ…āĻ¨ā§āϝāĻžāĻ¨ā§āϝ āϏāĻŦ āĻĄāĻŋāĻ­āĻžāχāϏ āĻĒā§āϰāϤāĻŋāĻ¸ā§āĻĨāĻžāĻĒāύ">
+<!ENTITY choice2.client.main.label     "&syncBrand.shortName.label; āĻĻā§āĻŦāĻžāϰāĻž āĻ•āĻŽā§āĻĒāĻŋāωāϟāĻžāϰ⧇āϰ āϏāĻŦ āĻĄāĻžāϟāĻž āĻĒā§āϰāϤāĻŋāĻ¸ā§āĻĨāĻžāĻĒāύ">
+<!ENTITY choice2.server.main.label     "āĻ•āĻŽā§āĻĒāĻŋāωāϟāĻžāϰ⧇āϰ āĻĄāĻžāϟāĻž āĻĻā§āĻŦāĻžāϰāĻž āĻ…āĻ¨ā§āϝāĻžāĻ¨ā§āϝ āϏāĻŦ āĻĄāĻŋāĻ­āĻžāχāϏ āĻĒā§āϰāϤāĻŋāĻ¸ā§āĻĨāĻžāĻĒāύ">
 <!-- Confirm Merge Options -->
 
 <!ENTITY setup.optionsConfirmPage.title "āύāĻŋāĻļā§āϚāĻŋāϤ">
-<!ENTITY confirm.merge.label "&syncBrand.fullName.label;āφāĻĒāύāĻžāϰ āϏāĻŋāĻ™ā§āĻ• āĻ…ā§āϝāĻžāĻ•āĻžāωāĻ¨ā§āĻŸā§‡ āĻāχ āĻ•āĻŽā§āĻĒāĻŋāωāϟāĻžāϰ⧇āϰ āϏāĻŦ āĻŦā§āϰāĻžāωāϜāĻžāϰ āĻĄāĻžāϟāĻž āĻāĻ•āĻ¤ā§āϰ⧀āĻ•āϰāĻŖ āĻ•āϰāĻž āĻšāĻŦ⧇āĨ¤">
-<!ENTITY confirm.client2.label "āϏāϤāĻ°ā§āϕ⧀āĻ•āϰāĻŖ: āĻ āĻ•āĻŽā§āĻĒāĻŋāωāϟāĻžāϰ⧇āϰ āύāĻŋāĻŽā§āύ⧋āĻ•ā§āϤ āϏāĻŦ &brandShortName; āĻĄāĻžāϟāĻž āĻ…āĻĒāϏāĻžāϰāύ āĻ•āϰāĻž āĻšāĻŦ⧇:">
+<!ENTITY confirm.merge.label    "&syncBrand.fullName.label;āφāĻĒāύāĻžāϰ āϏāĻŋāĻ™ā§āĻ• āĻ…ā§āϝāĻžāĻ•āĻžāωāĻ¨ā§āĻŸā§‡ āĻāχ āĻ•āĻŽā§āĻĒāĻŋāωāϟāĻžāϰ⧇āϰ āϏāĻŦ āĻŦā§āϰāĻžāωāϜāĻžāϰ āĻĄāĻžāϟāĻž āĻāĻ•āĻ¤ā§āϰ⧀āĻ•āϰāĻŖ āĻ•āϰāĻž āĻšāĻŦ⧇āĨ¤">
+<!ENTITY confirm.client2.label         "āϏāϤāĻ°ā§āϕ⧀āĻ•āϰāĻŖ: āĻ āĻ•āĻŽā§āĻĒāĻŋāωāϟāĻžāϰ⧇āϰ āύāĻŋāĻŽā§āύ⧋āĻ•ā§āϤ āϏāĻŦ &brandShortName; āĻĄāĻžāϟāĻž āĻ…āĻĒāϏāĻžāϰāύ āĻ•āϰāĻž āĻšāĻŦ⧇:">
 <!ENTITY confirm.client.moreinfo.label "&brandShortName; āφāĻĒāύāĻžāϰ āĻ•āĻŽā§āĻĒāĻŋāωāϟāĻžāϰ⧇  &syncBrand.fullName.label; āĻĄāĻžāϟāĻž āĻ…āύ⧁āϞāĻŋāĻĒāĻŋ āĻ•āϰāĻŦ⧇āĨ¤">
-<!ENTITY confirm.server2.label "āϏāϤāĻ°ā§āϕ⧀āĻ•āϰāĻŖ: āύāĻŋāĻŽā§āύ⧋āĻ•ā§āϤ āĻĄāĻŋāĻ­āĻžāχāϏ, āφāĻĒāύāĻžāϰ āĻ¸ā§āĻĨāĻžāĻ¨ā§€ā§Ÿ āĻĄāĻžāϟāĻž āĻĻā§āĻŦāĻžāϰāĻž āĻĒā§āϰāϤāĻŋāĻ¸ā§āĻĨāĻžāĻĒāĻŋāϤ āĻšāĻŦ⧇:">
+<!ENTITY confirm.server2.label         "āϏāϤāĻ°ā§āϕ⧀āĻ•āϰāĻŖ: āύāĻŋāĻŽā§āύ⧋āĻ•ā§āϤ āĻĄāĻŋāĻ­āĻžāχāϏ, āφāĻĒāύāĻžāϰ āĻ¸ā§āĻĨāĻžāĻ¨ā§€ā§Ÿ āĻĄāĻžāϟāĻž āĻĻā§āĻŦāĻžāϰāĻž āĻĒā§āϰāϤāĻŋāĻ¸ā§āĻĨāĻžāĻĒāĻŋāϤ āĻšāĻŦ⧇:">
 <!-- New & Existing Account: Setup Complete -->
 
 <!ENTITY setup.successPage.title "āϏ⧇āϟāφāĻĒ āϏāĻŽā§āĻĒāĻ¨ā§āύ">
 <!ENTITY changeOptions.label "āύāĻŋāĻŽā§āύ⧋āĻ•ā§āϤ āϏāĻŋāĻ™ā§āĻ• āĻ…āĻĒāĻļāύ āύāĻŋāĻ°ā§āĻŦāĻžāϚāύ āĻ•āϰ⧇ āφāĻĒāύāĻŋ āφāĻĒāύāĻžāϰ āĻĒāĻ›āĻ¨ā§āĻĻāϏāĻŽā§‚āĻš āĻĒāϰāĻŋāĻŦāĻ°ā§āϤāύ āĻ•āϰāϤ⧇ āĻĒāĻžāϰāĻŦ⧇āύāĨ¤">
 <!ENTITY continueUsing.label "āφāĻĒāύāĻŋ āĻāĻ–āύ &brandShortName; āĻŦā§āϝāĻŦāĻšāĻžāϰ āĻ•āϰ⧇ āϝ⧇āϤ⧇ āĻĒāĻžāϰ⧇āύāĨ¤">
--- a/browser/chrome/browser/syncSetup.properties
+++ b/browser/chrome/browser/syncSetup.properties
@@ -25,16 +25,17 @@ bookmarksCount.label        = #1 āĻŦ⧁āĻ•āĻŽāĻžāĻ°ā§āĻ•;#1 āĻŦ⧁āĻ•āĻŽāĻžāĻ°ā§āĻ•
 historyDaysCount.label      = āχāϤāĻŋāĻšāĻžāϏ⧇āϰ #1 āĻĻāĻŋāύ;āχāϤāĻŋāĻšāĻžāϏ⧇āϰ #1 āĻĻāĻŋāύ
 # LOCALIZATION NOTE (passwordsCount.label):
 # Semi-colon list of plural forms. See:
 # http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # #1 is the number of passwords (was %S for a short while, use #1 instead, even if both work)
 passwordsCount.label        = #1 āĻĒāĻžāϏāĻ“ā§ŸāĻžāĻ°ā§āĻĄ;#1 āĻĒāĻžāϏāĻ“ā§ŸāĻžāĻ°ā§āĻĄ
 
 save.synckey.title = āϏāĻŋāĻ™ā§āĻ• āϕ⧀ āϏāĻ‚āϰāĻ•ā§āώāĻŖ
+save.default.label = Firefox Sync Key.html
 
 newAccount.action.label = āĻĢāĻžā§ŸāĻžāϰāĻĢāĻ•ā§āϏ āϏāĻŋāĻ™ā§āĻ• āĻāĻ–āύ āφāĻĒāύāĻžāϰ āϏāĻŦ āĻŦā§āϰāĻžāωāϜāĻžāϰ āĻĄāĻžāϟāĻž āĻ¸ā§āĻŦ⧟āĻ‚āĻ•ā§āϰāĻŋ⧟āĻ­āĻžāĻŦ⧇ āϏāĻŋāĻ™ā§āĻ• āĻ•āϰāĻžāϰ āϜāĻ¨ā§āϝ āύāĻŋāĻ°ā§āϧāĻžāϰāύ āĻ•āϰāĻž āĻšā§Ÿā§‡āϛ⧇āĨ¤
 newAccount.change.label = āύāĻŋāĻŽā§āύ⧇āϰ āϏāĻŋāĻ™ā§āĻ• āĻ…āĻĒāĻļāύ āύāĻŋāĻ°ā§āĻŦāĻžāϚāύ āĻ•āϰ⧇ āĻ•āĻŋ āϏāĻŋāĻ™ā§āĻ• āĻ•āϰāϤ⧇ āϚāĻžāύ āϏ⧁āύāĻŋāĻ°ā§āĻĻāĻŋāĻˇā§āϟāĻ­āĻžāĻŦ⧇ āĻŦāĻžāĻ›āĻžāχ āĻ•āϰāϤ⧇ āĻĒāĻžāϰ⧇āύāĨ¤
 resetClient.change.label = āĻĢāĻžā§ŸāĻžāϰāĻĢāĻ•ā§āϏ āϏāĻŋāĻ™ā§āĻ• āφāĻĒāύāĻžāϰ āĻ•āĻŽā§āĻĒāĻŋāωāϟāĻžāϰ⧇āϰ āϏāĻŦ āĻŦā§āϰāĻžāωāϜāĻžāϰ āĻĄāĻžāϟāĻž āφāĻĒāύāĻžāϰ āϏāĻŋāĻ™ā§āĻ• āĻ…ā§āϝāĻžāĻ•āĻžāωāĻ¨ā§āĻŸā§‡ āĻāĻ•āĻ¤ā§āϰ⧀āĻ•āϰāĻŖ āĻ•āϰāĻŦ⧇āĨ¤
 wipeClient.change.label = āĻĢāĻžā§ŸāĻžāϰāĻĢāĻ•ā§āϏ āϏāĻŋāĻ™ā§āĻ• āφāĻĒāύāĻžāϰ āĻ•āĻŽā§āĻĒāĻŋāωāϟāĻžāϰ⧇āϰ āϏāĻŦ āĻŦā§āϰāĻžāωāϜāĻžāϰ āĻĄāĻžāϟāĻž āφāĻĒāύāĻžāϰ āϏāĻŋāĻ™ā§āĻ• āĻ…ā§āϝāĻžāĻ•āĻžāωāĻ¨ā§āĻŸā§‡ āĻĒā§āϰāϤāĻŋāĻ¸ā§āĻĨāĻžāĻĒāύ āĻ•āϰāĻŦ⧇āĨ¤
 wipeRemote.change.label = āĻĢāĻžā§ŸāĻžāϰāĻĢāĻ•ā§āϏ āϏāĻŋāĻ™ā§āĻ• āφāĻĒāύāĻžāϰ āĻ•āĻŽā§āĻĒāĻŋāωāϟāĻžāϰ⧇āϰ āϏāĻŦ āĻŦā§āϰāĻžāωāϜāĻžāϰ āĻĄāĻžāϟāĻž āĻ•āĻŽā§āĻĒāĻŋāωāϟāĻžāϰ⧇āϰ āĻĄāĻžāϟāĻžāϰ āϏāĻžāĻĨ⧇ āφāĻĒāύāĻžāϰ āϏāĻŋāĻ™ā§āĻ• āĻ…ā§āϝāĻžāĻ•āĻžāωāĻ¨ā§āĻŸā§‡ āĻĒā§āϰāϤāĻŋāĻ¸ā§āĻĨāĻžāĻĒāύ āĻ•āϰāĻŦ⧇āĨ¤
 existingAccount.change.label = āύāĻŋāĻŽā§āύ⧇āϰ āϏāĻŋāĻ™ā§āĻ• āĻ…āĻĒāĻļāύ āύāĻŋāĻ°ā§āĻŦāĻžāϚāύ āĻ•āϰ⧇ āĻāχ āĻĒāĻ›āĻ¨ā§āĻĻāϏāĻŽā§‚āĻš āĻĒāϰāĻŋāĻŦāĻ°ā§āϤāύ āĻ•āϰāϤ⧇ āĻĒāĻžāϰ⧇āύāĨ¤
 
--- a/browser/chrome/browser/tabbrowser.dtd
+++ b/browser/chrome/browser/tabbrowser.dtd
@@ -1,2 +1,2 @@
-<!ENTITY closeTab.label "āĻŸā§āϝāĻžāĻŦ āĻŦāĻ¨ā§āϧ (C)">
-<!ENTITY newTabButton.tooltip "āĻāĻ•āϟāĻŋ āύāϤ⧁āύ āĻŸā§āϝāĻžāĻŦ āĻ–ā§‹āϞāĻž āĻšāĻŦ⧇">
+<!ENTITY  closeTab.label         "āĻŸā§āϝāĻžāĻŦ āĻŦāĻ¨ā§āϧ (C)">
+<!ENTITY  newTabButton.tooltip        "āĻāĻ•āϟāĻŋ āύāϤ⧁āύ āĻŸā§āϝāĻžāĻŦ āĻ–ā§‹āϞāĻž āĻšāĻŦ⧇">
--- a/browser/chrome/overrides/settingsChange.dtd
+++ b/browser/chrome/overrides/settingsChange.dtd
@@ -33,10 +33,10 @@
 # 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 settingsChangePreferences.label "&brandShortName; āĻāϰ āĻĒāĻ›āĻ¨ā§āĻĻāϏāĻŽā§‚āĻšā§‡āϰ āĻ…ā§āϝāĻžāĻĒā§āϞāĻŋāϕ⧇āĻļāύ āĻŸā§āϝāĻžāĻŦ āĻĨ⧇āϕ⧇ āϏ⧇āϟāĻŋāĻ‚ āĻĒāϰāĻŋāĻŦāĻ°ā§āϤāύ āĻ•āϰāĻž āϏāĻŽā§āĻ­āĻŦāĨ¤">
-<!ENTITY settingsChangeOptions.label "&brandShortName; āĻāϰ āĻ…āĻĒāĻļāύ⧇āϰ āĻ…ā§āϝāĻžāĻĒā§āϞāĻŋāϕ⧇āĻļāύ āĻŸā§āϝāĻžāĻŦ āĻĨ⧇āϕ⧇ āϏ⧇āϟāĻŋāĻ‚ āĻĒāϰāĻŋāĻŦāĻ°ā§āϤāύ āĻ•āϰāĻž āϏāĻŽā§āĻ­āĻŦāĨ¤">
+<!ENTITY  settingsChangePreferences.label  "&brandShortName; āĻāϰ āĻĒāĻ›āĻ¨ā§āĻĻāϏāĻŽā§‚āĻšā§‡āϰ āĻ…ā§āϝāĻžāĻĒā§āϞāĻŋāϕ⧇āĻļāύ āĻŸā§āϝāĻžāĻŦ āĻĨ⧇āϕ⧇ āϏ⧇āϟāĻŋāĻ‚ āĻĒāϰāĻŋāĻŦāĻ°ā§āϤāύ āĻ•āϰāĻž āϏāĻŽā§āĻ­āĻŦāĨ¤">
+<!ENTITY  settingsChangeOptions.label      "&brandShortName; āĻāϰ āĻ…āĻĒāĻļāύ⧇āϰ āĻ…ā§āϝāĻžāĻĒā§āϞāĻŋāϕ⧇āĻļāύ āĻŸā§āϝāĻžāĻŦ āĻĨ⧇āϕ⧇ āϏ⧇āϟāĻŋāĻ‚ āĻĒāϰāĻŋāĻŦāĻ°ā§āϤāύ āĻ•āϰāĻž āϏāĻŽā§āĻ­āĻŦāĨ¤">
--- a/browser/feedback/main.dtd
+++ b/browser/feedback/main.dtd
@@ -1,33 +1,33 @@
-<!ENTITY testpilot.brand.label "āĻĒāĻžāχāϞāϟ āĻĒāϰ⧀āĻ•ā§āώāĻž">
-<!ENTITY testpilot.settings.label "āϏ⧇āϟāĻŋāĻ‚">
-<!ENTITY testpilot.settings.dataSubmission.label "āĻĄāĻžāϟāĻž āϜāĻŽāĻž">
-<!ENTITY testpilot.settings.notifications.label "āĻ˜ā§‹āώāύāĻž">
-<!ENTITY testpilot.settings.notifyWhen.label "āφāĻŽāĻžāϕ⧇ āĻ˜ā§‹āώāύāĻž āĻĻāĻŋāύ āϝāĻ–āύ... ">
-<!ENTITY testpilot.settings.readyToSubmit.label "āĻāĻ•āϟāĻŋ āĻŦāĻŋāĻļā§āϞ⧇āώāĻŖ āϜāĻŽāĻž āĻĻ⧇āĻ“ā§ŸāĻžāϰ āϜāĻ¨ā§āϝ āϤ⧈āϰāĻŋ">
-<!ENTITY testpilot.settings.newStudy.label "āĻāĻ–āĻžāύ⧇ āĻāĻ•āϟāĻŋ āύāϤ⧁āύ āĻŦāĻŋāĻļā§āϞ⧇āώāĻŖ āφāϛ⧇">
-<!ENTITY testpilot.settings.hasNewResults.label "āĻāĻ•āϟāĻŋ āĻŦāĻŋāĻļā§āϞ⧇āώāϪ⧇āϰ āύāϤ⧁āύ āĻĢāϞāĻžāĻĢāϞ">
-<!ENTITY testpilot.settings.alwaysSubmitData.label "āĻ¸ā§āĻŦ⧟āĻ‚āĻ•ā§āϰāĻŋ⧟āĻ­āĻžāĻŦ⧇ āφāĻŽāĻžāϰ āĻĄāĻžāϟāĻž āϜāĻŽāĻž āĻĻāĻŋāύ (āφāĻŽāĻžāϕ⧇ āϜāĻŋāĻœā§āĻžāĻžāϏāĻž āĻ•āϰāĻž āĻŦā§āϝāϤ⧀āϤ)">
-<!ENTITY testpilot.allYourStudies.label "āφāĻĒāύāĻžāϰ āϏāĻŦ āĻŦā§āϝāĻŦāĻšāĻžāϰāĻ•āĻžāϰ⧀āϰ āĻŦāĻŋāĻļā§āϞ⧇āώāĻŖ...">
-<!ENTITY testpilot.about.label "āĻĒāĻžāχāϞāϟ āĻĒāϰ⧀āĻ•ā§āώāĻž āϏāĻŽā§āĻĒāĻ°ā§āĻ•āĻŋāϤ">
+<!ENTITY testpilot.brand.label                      "āĻĒāĻžāχāϞāϟ āĻĒāϰ⧀āĻ•ā§āώāĻž">
+<!ENTITY testpilot.settings.label                   "āϏ⧇āϟāĻŋāĻ‚">
+<!ENTITY testpilot.settings.dataSubmission.label    "āĻĄāĻžāϟāĻž āϜāĻŽāĻž">
+<!ENTITY testpilot.settings.notifications.label     "āĻ˜ā§‹āώāύāĻž">
+<!ENTITY testpilot.settings.notifyWhen.label        "āφāĻŽāĻžāϕ⧇ āĻ˜ā§‹āώāύāĻž āĻĻāĻŋāύ āϝāĻ–āύ... ">
+<!ENTITY testpilot.settings.readyToSubmit.label     "āĻāĻ•āϟāĻŋ āĻŦāĻŋāĻļā§āϞ⧇āώāĻŖ āϜāĻŽāĻž āĻĻ⧇āĻ“ā§ŸāĻžāϰ āϜāĻ¨ā§āϝ āϤ⧈āϰāĻŋ">
+<!ENTITY testpilot.settings.newStudy.label          "āĻāĻ–āĻžāύ⧇ āĻāĻ•āϟāĻŋ āύāϤ⧁āύ āĻŦāĻŋāĻļā§āϞ⧇āώāĻŖ āφāϛ⧇">
+<!ENTITY testpilot.settings.hasNewResults.label     "āĻāĻ•āϟāĻŋ āĻŦāĻŋāĻļā§āϞ⧇āώāϪ⧇āϰ āύāϤ⧁āύ āĻĢāϞāĻžāĻĢāϞ">
+<!ENTITY testpilot.settings.alwaysSubmitData.label  "āĻ¸ā§āĻŦ⧟āĻ‚āĻ•ā§āϰāĻŋ⧟āĻ­āĻžāĻŦ⧇ āφāĻŽāĻžāϰ āĻĄāĻžāϟāĻž āϜāĻŽāĻž āĻĻāĻŋāύ (āφāĻŽāĻžāϕ⧇ āϜāĻŋāĻœā§āĻžāĻžāϏāĻž āĻ•āϰāĻž āĻŦā§āϝāϤ⧀āϤ)">
+<!ENTITY testpilot.allYourStudies.label             "āφāĻĒāύāĻžāϰ āϏāĻŦ āĻŦā§āϝāĻŦāĻšāĻžāϰāĻ•āĻžāϰ⧀āϰ āĻŦāĻŋāĻļā§āϞ⧇āώāĻŖ...">
+<!ENTITY testpilot.about.label                      "āĻĒāĻžāχāϞāϟ āĻĒāϰ⧀āĻ•ā§āώāĻž āϏāĻŽā§āĻĒāĻ°ā§āĻ•āĻŋāϤ">
 <!-- all studies window -->
 
-<!ENTITY testpilot.studiesWindow.title "āφāĻĒāύāĻžāϰ āĻĒāĻžāχāϞāϟ āĻĒāϰ⧀āĻ•ā§āώāĻžāϰ āĻŦāĻŋāĻļā§āϞ⧇āώāĻŖ ">
-<!ENTITY testpilot.studiesWindow.currentStudies.label "āĻŦāĻ°ā§āϤāĻŽāĻžāύ āĻŦāĻŋāĻļā§āϞ⧇āώāĻŖ ">
-<!ENTITY testpilot.studiesWindow.finishedStudies.label "āĻŦāĻŋāĻļā§āϞ⧇āώāĻŖ āϏāĻŽā§āĻĒā§‚āĻ°ā§āĻŖ ">
-<!ENTITY testpilot.studiesWindow.studyFindings.label "āĻŦāĻŋāĻļā§āϞ⧇āώāĻŖ āĻšāϤ⧇ āĻĒā§āϰāĻžāĻĒā§āϤ āϏāĻŋāĻĻā§āϧāĻžāĻ¨ā§āϤ">
-<!ENTITY testpilot.studiesWindow.settings.label "āϏ⧇āϟāĻŋāĻ‚">
-<!ENTITY testpilot.studiesWindow.stillLoadingMessage "āϞ⧋āĻĄ āĻ•āϰāĻž āĻšāĻšā§āϛ⧇, āĻ…āύ⧁āĻ—ā§āϰāĻš āĻ•āϰ⧇ āĻ…āĻĒ⧇āĻ•ā§āώāĻž āĻ•āϰ⧁āύ...">
+<!ENTITY testpilot.studiesWindow.title                  "āφāĻĒāύāĻžāϰ āĻĒāĻžāχāϞāϟ āĻĒāϰ⧀āĻ•ā§āώāĻžāϰ āĻŦāĻŋāĻļā§āϞ⧇āώāĻŖ ">
+<!ENTITY testpilot.studiesWindow.currentStudies.label   "āĻŦāĻ°ā§āϤāĻŽāĻžāύ āĻŦāĻŋāĻļā§āϞ⧇āώāĻŖ ">
+<!ENTITY testpilot.studiesWindow.finishedStudies.label  "āĻŦāĻŋāĻļā§āϞ⧇āώāĻŖ āϏāĻŽā§āĻĒā§‚āĻ°ā§āĻŖ ">
+<!ENTITY testpilot.studiesWindow.studyFindings.label    "āĻŦāĻŋāĻļā§āϞ⧇āώāĻŖ āĻšāϤ⧇ āĻĒā§āϰāĻžāĻĒā§āϤ āϏāĻŋāĻĻā§āϧāĻžāĻ¨ā§āϤ">
+<!ENTITY testpilot.studiesWindow.settings.label         "āϏ⧇āϟāĻŋāĻ‚">
+<!ENTITY testpilot.studiesWindow.stillLoadingMessage    "āϞ⧋āĻĄ āĻ•āϰāĻž āĻšāĻšā§āϛ⧇, āĻ…āύ⧁āĻ—ā§āϰāĻš āĻ•āϰ⧇ āĻ…āĻĒ⧇āĻ•ā§āώāĻž āĻ•āϰ⧁āύ...">
 <!-- raw data dialog -->
 
-<!ENTITY testpilot.rawDataWindow.title "āĻĒāĻžāχāϞāϟ āĻĒāϰ⧀āĻ•ā§āώāĻž: āĻ…āĻļā§‹āϧāĻŋāϤ āĻĄāĻžāϟāĻž">
+<!ENTITY testpilot.rawDataWindow.title                  "āĻĒāĻžāχāϞāϟ āĻĒāϰ⧀āĻ•ā§āώāĻž: āĻ…āĻļā§‹āϧāĻŋāϤ āĻĄāĻžāϟāĻž">
 <!-- notification -->
 
-<!ENTITY testpilot.notification.close.tooltip "āĻŦāĻ¨ā§āϧ">
+<!ENTITY testpilot.notification.close.tooltip            "āĻŦāĻ¨ā§āϧ">
 <!-- Firefox 4 beta version UI -->
 
-<!ENTITY testpilot.enable.label "āĻŦā§āϝāĻŦāĻšāĻžāϰāĻ•āĻžāϰ⧀āϰ āĻŦāĻŋāĻļā§āϞ⧇āώāĻŖ āϏāϚāϞ āĻ•āϰ⧁āύ">
-<!ENTITY testpilot.feedbackbutton.label "āĻŽāĻ¨ā§āϤāĻŦā§āϝ">
-<!ENTITY testpilot.happy.label "āĻĢāĻžā§ŸāĻžāϰāĻĢāĻ•ā§āϏ āĻŦā§āϝāĻŦāĻšāĻžāϰ āĻ•āϰ⧇ āφāĻŽāĻŋ āφāύāĻ¨ā§āĻĻāĻŋāϤ āĻ•āĻžāϰāύ...">
-<!ENTITY testpilot.sad.label "āĻĢāĻžā§ŸāĻžāϰāĻĢāĻ•ā§āϏ āĻŦā§āϝāĻŦāĻšāĻžāϰ āĻ•āϰ⧇ āφāĻŽāĻžāϰ āĻ­āĻžāϞ⧋ āϞāĻžāϗ⧇āύāĻŋ āĻ•āĻžāϰāύ...">
-<!ENTITY testpilot.broken.label "āĻāχ āĻ“ā§Ÿā§‡āĻŦāϏāĻžāχāϟāϟāĻŋ āĻ āĻŋāĻ• āĻŽāϤ āĻ•āĻžāϜ āĻ•āϰāϛ⧇ āύāĻž, āϏ⧇āϟāĻŋ āϜāĻžāύāĻžāύâ€Ļ">
-<!ENTITY testpilot.idea.label "āφāĻĒāύāĻžāϰ āĻĒāϰāĻžāĻŽāĻ°ā§āĻļ āĻĻāĻŋāύâ€Ļ">
+<!ENTITY testpilot.enable.label                        "āĻŦā§āϝāĻŦāĻšāĻžāϰāĻ•āĻžāϰ⧀āϰ āĻŦāĻŋāĻļā§āϞ⧇āώāĻŖ āϏāϚāϞ āĻ•āϰ⧁āύ">
+<!ENTITY testpilot.feedbackbutton.label                "āĻŽāĻ¨ā§āϤāĻŦā§āϝ">
+<!ENTITY testpilot.happy.label        "āĻĢāĻžā§ŸāĻžāϰāĻĢāĻ•ā§āϏ āĻŦā§āϝāĻŦāĻšāĻžāϰ āĻ•āϰ⧇ āφāĻŽāĻŋ āφāύāĻ¨ā§āĻĻāĻŋāϤ āĻ•āĻžāϰāύ...">
+<!ENTITY testpilot.sad.label          "āĻĢāĻžā§ŸāĻžāϰāĻĢāĻ•ā§āϏ āĻŦā§āϝāĻŦāĻšāĻžāϰ āĻ•āϰ⧇ āφāĻŽāĻžāϰ āĻ­āĻžāϞ⧋ āϞāĻžāϗ⧇āύāĻŋ āĻ•āĻžāϰāύ...">
+<!ENTITY testpilot.broken.label      "āĻāχ āĻ“ā§Ÿā§‡āĻŦāϏāĻžāχāϟāϟāĻŋ āĻ āĻŋāĻ• āĻŽāϤ āĻ•āĻžāϜ āĻ•āϰāϛ⧇ āύāĻž, āϏ⧇āϟāĻŋ āϜāĻžāύāĻžāύâ€Ļ">
+<!ENTITY testpilot.idea.label        "āφāĻĒāύāĻžāϰ āĻĒāϰāĻžāĻŽāĻ°ā§āĻļ āĻĻāĻŋāύâ€Ļ">
--- a/browser/installer/custom.properties
+++ b/browser/installer/custom.properties
@@ -48,17 +48,16 @@
 # being used as an accesskey.
 
 # You can use \n to create a newline in the string but only when the string
 # from en-US contains a \n.
 
 REG_APP_DESC=$BrandShortName āύāĻŋāϰāĻžāĻĒāĻĻ āĻāĻŦāĻ‚ āĻ¸ā§āĻŦāĻšā§āĻ›āĻ¨ā§āĻĻ āĻŦā§āϰāĻžāωāϜāĻŋāĻ‚ āύāĻŋāĻŦ⧇āĻĻāύ āĻ•āϰ⧇āĨ¤ āĻĒāϰāĻŋāϚāĻŋāϤ āχāĻ¨ā§āϟāĻžāϰāĻĢ⧇āϏ, āĻĒāϰāĻŋāϚ⧟ āϜāĻžāϞāĻŋ⧟āĻžāϤāĻŋāϰ āĻŦāĻŋāϰ⧁āĻĻā§āϧ⧇ āĻŦā§āϝāĻŦāĻ¸ā§āĻĨāĻž āϏāĻŽā§āĻĒāĻ¨ā§āύ āωāĻ¨ā§āύāϤ āύāĻŋāϰāĻžāĻĒāĻ¤ā§āϤāĻž, āĻāĻŦāĻ‚ āĻāĻ•āϟāĻŋ āĻĒ⧁āĻ°ā§āύāĻžāĻ™ā§āĻ— āĻ…āύ⧁āϏāĻ¨ā§āϧāĻžāύ āĻŦā§āϝāĻŦāĻ¸ā§āĻĨāĻž āφāĻĒāύāĻžāϕ⧇ āĻ“ā§Ÿā§‡āĻŦ⧇āϰ āĻĒā§‚āĻ°ā§āĻŖ āĻ…āĻ­āĻŋāĻœā§āĻžāϤāĻž āĻĒ⧇āϤ⧇ āϏāĻžāĻšāĻžāĻ¯ā§āϝ āĻ•āϰāĻŦ⧇āĨ¤
 CONTEXT_OPTIONS=$BrandShortName āĻ…āĻĒāĻļāύ (&O)
 CONTEXT_SAFE_MODE=$BrandShortName āύāĻŋāϰāĻžāĻĒāĻĻ āĻŽā§‹āĻĄ (&S)
-SAFE_MODE=āύāĻŋāϰāĻžāĻĒāĻĻ āĻŽā§‹āĻĄ
 OPTIONS_PAGE_TITLE=āϏ⧇āϟāφāĻĒ⧇āϰ āϧāϰāύ
 OPTIONS_PAGE_SUBTITLE=āϏ⧇āϟāφāĻĒ⧇āϰ āĻ…āĻĒāĻļāύ āύāĻŋāĻ°ā§āĻŦāĻžāϚāύ
 SHORTCUTS_PAGE_TITLE=āĻļāĻ°ā§āϟāĻ•āĻžāϟ āύāĻŋāĻ°ā§āϧāĻžāϰāĻŖ
 SHORTCUTS_PAGE_SUBTITLE=āĻĒā§āϰ⧋āĻ—ā§āϰāĻžāĻŽ āφāχāĻ•āύ āϤ⧈āϰāĻŋ
 SUMMARY_PAGE_TITLE=āϏāĻžāϰāϏāĻ‚āĻ•ā§āώ⧇āĻĒ
 SUMMARY_PAGE_SUBTITLE=$BrandShortName āχāύāĻ¸ā§āϟāϞ⧇āĻļāύ āĻļ⧁āϰ⧁ āĻ•āϰāϤ⧇ āĻĒā§āϰāĻ¸ā§āϤ⧁āϤ
 SUMMARY_INSTALLED_TO=$BrandShortName āϝ⧇ āϜāĻžā§ŸāĻ—āĻžā§Ÿ āχāύāĻ¸ā§āϟāϞ āĻ•āϰāĻž āĻšāĻŦ⧇:
 SUMMARY_REBOOT_REQUIRED_INSTALL=āχāύāĻ¸ā§āϟāϞ⧇āĻļāύ āϏāĻŽā§āĻĒāĻ¨ā§āύ āĻ•āϰāϤ⧇ āφāĻĒāύāĻžāϰ āĻ•āĻŽā§āĻĒāĻŋāωāϟāĻžāϰ āĻĒ⧁āύāϰāĻžā§Ÿ āϚāĻžāϞ⧁ āĻ•āϰāϤ⧇ āĻšāϤ⧇ āĻĒāĻžāϰ⧇āĨ¤
--- a/dom/chrome/dom/dom.properties
+++ b/dom/chrome/dom/dom.properties
@@ -70,10 +70,8 @@ FormValidationCheckboxMissing=āĻ…āĻ—ā§āϰāϏāϰ āĻšāĻ“ā§ŸāĻžāϰ āϜāĻ¨ā§āϝ āĻ…āύ⧁āĻ—ā§āϰāĻš āĻ•āϰ⧇ āĻŦāĻžāĻ•ā§āϏāϟāĻŋ āύāĻŋāĻ°ā§āĻŦāĻžāϚāύ āĻ•āϰ⧁āύāĨ¤
 FormValidationRadioMissing=āĻ…āύ⧁āĻ—ā§āϰāĻš āĻ•āϰ⧇ āĻāχ āĻ…āĻĒāĻļāύāϏāĻŽā§‚āĻš āĻšāϤ⧇ āĻāĻ•āϟāĻŋ āĻ…āĻĒāĻļāύ āύāĻŋāĻ°ā§āĻŦāĻžāϚāύ āĻ•āϰ⧁āύāĨ¤
 FormValidationFileMissing=āĻ…āύ⧁āĻ—ā§āϰāĻš āĻ•āϰ⧇ āĻāĻ•āϟāĻŋ āĻĢāĻžāχāϞ āύāĻŋāĻ°ā§āĻŦāĻžāϚāύ āĻ•āϰ⧁āύāĨ¤
 FormValidationSelectMissing=āĻ…āύ⧁āĻ—ā§āϰāĻš āĻ•āϰ⧇ āϤāĻžāϞāĻŋāĻ•āĻž āĻšāϤ⧇ āĻāĻ•āϟāĻŋ āφāχāĻŸā§‡āĻŽ āύāĻŋāĻ°ā§āĻŦāĻžāϚāύ āĻ•āϰ⧁āύāĨ¤
 FormValidationInvalidEmail=āĻ…āύ⧁āĻ—ā§āϰāĻš āĻ•āϰ⧇ āφāĻĒāύāĻžāϰ āχāĻŽā§‡āχāϞ āĻ āĻŋāĻ•āĻžāύāĻžāϟāĻŋ āĻĻāĻŋāύāĨ¤
 FormValidationInvalidURL=āĻ…āύ⧁āĻ—ā§āϰāĻš āĻ•āϰ⧇ āĻāĻ•āϟāĻŋ URL āĻĻāĻŋāύāĨ¤
 FormValidationPatternMismatch=āĻ…āύ⧁āĻ—ā§āϰāĻš āĻ•āϰ⧇ āĻ…āύ⧁āϰ⧋āϧāĻ•ā§ƒāϤ āĻŦāĻŋāĻ¨ā§āϝāĻžāϏ⧇āϰ āϏāĻžāĻĨ⧇ āĻŽāĻŋāϞ āϰāĻžāϖ⧁āύāĨ¤
 # LOCALIZATION NOTE (FormValidationPatternMismatchWithTitle): %S is the (possibly truncated) title attribute value.
 FormValidationPatternMismatchWithTitle=āĻ…āύ⧁āĻ—ā§āϰāĻš āĻ•āϰ⧇ āĻ…āύ⧁āϰ⧋āϧāĻ•ā§ƒāϤ āĻŦāĻŋāĻ¨ā§āϝāĻžāϏ⧇āϰ āϏāĻžāĻĨ⧇ āĻŽāĻŋāϞ āϰāĻžāϖ⧁āύ : %S 
-UseOfDocumentWidthWarning=āĻ…āύāĻžāĻĻāĻ°ā§āĻļ document.width āĻŦā§āϝāĻŦāĻšāĻžāϰ āĻ•āϰāĻž āĻšā§Ÿā§‡āϛ⧇āĨ¤ āĻāϰ āĻĒāϰāĻŋāĻŦāĻ°ā§āϤ⧇ āφāĻĻāĻ°ā§āĻļ document.body.clientWidth āĻŦā§āϝāĻŦāĻšāĻžāϰ āĻ•āϰ⧁āύāĨ¤
-UseOfDocumentHeightWarning=āĻ…āύāĻžāĻĻāĻ°ā§āĻļ document.width āĻŦā§āϝāĻŦāĻšāĻžāϰ āĻ•āϰāĻž āĻšā§Ÿā§‡āϛ⧇āĨ¤ āĻāϰ āĻĒāϰāĻŋāĻŦāĻ°ā§āϤ⧇ āφāĻĻāĻ°ā§āĻļ document.body.clientHeight āĻŦā§āϝāĻŦāĻšāĻžāϰ āĻ•āϰ⧁āύāĨ¤
--- a/dom/chrome/layout/css.properties
+++ b/dom/chrome/layout/css.properties
@@ -50,18 +50,20 @@ PECharsetRuleEOF=@charset āύāĻŋ⧟āĻŽā§‡āϰ āĻŽāĻ§ā§āϝ⧇ charset āĻ¸ā§āĻŸā§āϰāĻŋāĻ‚
 PECharsetRuleNotString=āĻĒā§āϰāĻ¤ā§āϝāĻžāĻļāĻŋāϤ charset āĻ¸ā§āĻŸā§āϰāĻŋāĻ‚ āĻāϰ āĻĒāϰāĻŋāĻŦāĻ°ā§āϤ⧇ '%1$S' āĻĒāĻžāĻ“ā§ŸāĻž āĻ—āĻŋā§Ÿā§‡āϛ⧇āĨ¤
 PEGatherMediaEOF=@import āĻ…āĻĨāĻŦāĻž @media āύāĻŋ⧟āĻŽā§‡āϰ āĻŽāĻ§ā§āϝ⧇ āĻŽāĻŋāĻĄāĻŋ⧟āĻž āϤāĻžāϞāĻŋāĻ•āĻžāϰ āϏāĻŽāĻžāĻĒā§āϤāĻŋ
 PEGatherMediaNotComma=āĻŽāĻŋāĻĄāĻŋ⧟āĻž āϤāĻžāϞāĻŋāĻ•āĻžā§Ÿ āĻĒā§āϰāĻ¤ā§āϝāĻžāĻļāĻŋāϤ ',' āĻāϰ āĻĒāϰāĻŋāĻŦāĻ°ā§āϤ⧇ '%1$S' āĻĒāĻžāĻ“ā§ŸāĻž āĻ—āĻŋā§Ÿā§‡āϛ⧇āĨ¤
 PEGatherMediaNotIdent=āĻŽāĻŋāĻĄāĻŋ⧟āĻž āϤāĻžāϞāĻŋāĻ•āĻžā§Ÿ āĻĒā§āϰāĻ¤ā§āϝāĻžāĻļāĻŋāϤ āφāχāĻĄā§‡āĻ¨ā§āϟāĻŋāĻĢāĻžā§ŸāĻžāϰ⧇āϰ āĻĒāϰāĻŋāĻŦāĻ°ā§āϤ⧇ '%1$S' āĻĒāĻžāĻ“ā§ŸāĻž āĻ—āĻŋā§Ÿā§‡āϛ⧇āĨ¤
 PEImportNotURI=@import āύāĻŋāϝāĻŧāĻŽā§‡āϰ āĻŽāĻ§ā§āϝ⧇ āĻĒā§āϰāĻ¤ā§āϝāĻžāĻļāĻŋāϤ URI āĻāϰ āĻĒāϰāĻŋāĻŦāĻ°ā§āϤ⧇ '%1$S' āĻĒāĻžāĻ“ā§ŸāĻž āĻ—āĻŋā§Ÿā§‡āϛ⧇āĨ¤
 PEImportBadURI=@āχāĻŽā§āĻĒā§‹āĻ°ā§āϟ āϰ⧁āϞ⧇ āĻ…āĻ•āĻžāĻ°ā§āϝāĻ•āϰ URI: '%1$S'
 PEImportUnexpected=@import āĻāϰ āĻŽāĻ§ā§āϝ⧇ āĻ…āĻĒā§āϰāĻ¤ā§āϝāĻžāĻļāĻŋāϤ '%1$S' āĻĒāĻžāĻ“ā§ŸāĻž āĻ—āĻŋā§Ÿā§‡āϛ⧇āĨ¤
 PEGroupRuleEOF=@media āĻ…āĻĨāĻŦāĻž @-moz-document āύāĻŋ⧟āĻŽā§‡āϰ āϏāĻŽāĻžāĻĒā§āϤāĻŋ
+PEGroupRuleNestedAtRule=%1$S rule not allowed within @media or @-moz-document rule.
 PEMozDocRuleBadFunc=@-moz-document āύāĻŋ⧟āĻŽā§‡āϰ āĻŽāĻ§ā§āϝ⧇ āĻĒā§āϰāĻ¤ā§āϝāĻžāĻļāĻŋāϤ url(), url-prefix(), or domain() āĻāϰ āĻĒāϰāĻŋāĻŦāĻ°ā§āϤ⧇ '%1$S' āĻĒāĻžāĻ“ā§ŸāĻž āĻ—āĻŋā§Ÿā§‡āϛ⧇āĨ¤
 PEMozDocRuleNotURI=@-moz-document āύāĻŋ⧟āĻŽā§‡āϰ āĻŽāĻ§ā§āϝ⧇ āĻĒā§āϰāĻ¤ā§āϝāĻžāĻļāĻŋāϤ URI āĻāϰ āĻĒāϰāĻŋāĻŦāĻ°ā§āϤ⧇ '%1$S' āĻĒāĻžāĻ“ā§ŸāĻž āĻ—āĻŋā§Ÿā§‡āϛ⧇āĨ¤
+PEMozDocRuleNotString=Expected string in @-moz-document rule regexp() function but found '%1$S'.
 PEAtNSPrefixEOF=@namespace āύāĻŋ⧟āĻŽā§‡āϰ āĻŽāĻ§ā§āϝ⧇ namespace āĻĒā§āϰāĻŋāĻĢāĻŋāĻ•ā§āϏ
 PEAtNSURIEOF=@namespace āύāĻŋ⧟āĻŽā§‡āϰ āĻŽāĻ§ā§āϝ⧇ namespace URI
 PEAtNSUnexpected=@namespace āĻāϰ āĻŽāĻ§ā§āϝ⧇ āĻ…āĻĒā§āϰāĻ¤ā§āϝāĻžāĻļāĻŋāϤ āĻŸā§‹āϕ⧇āύ: '%1$S'āĨ¤
 PEKeyframeNameEOF=@keyframes āύāĻŋ⧟āĻŽā§‡ āύāĻžāĻŽāĨ¤
 PEKeyframeBadName=@keyframes āύāĻŋ⧟āĻŽā§‡āϰ āύāĻžāĻŽā§‡ āĻĒā§āϰāĻ¤ā§āϝāĻžāĻļāĻŋāϤ āĻļāύāĻžāĻ•ā§āϤāĻ•āĻžāϰ⧀āĨ¤
 PEKeyframeBrace=āĻĒā§āϰāĻ¤ā§āϝāĻžāĻļāĻŋāϤ āĻ“āĻĒ⧇āύāĻŋāĻ‚ { of @keyframes āύāĻŋ⧟āĻŽā§‡āϰāĨ¤
 PESkipDeclBraceEOF=āĻĄā§‡āĻ•ā§āϞāĻžāϰ⧇āĻļāύ āĻŦā§āϞāϕ⧇āϰ āϏāĻŽāĻžāĻĒāύ⧀ }
 PESkipRSBraceEOF=āĻ…āĻ•āĻžāĻ°ā§āϝāĻ•āϰ āύāĻŋ⧟āĻŽ āϏ⧇āĻŸā§‡āϰ āϏāĻŽāĻžāĻĒāύ⧀ }
--- a/editor/ui/chrome/composer/editor.dtd
+++ b/editor/ui/chrome/composer/editor.dtd
@@ -35,23 +35,66 @@
    -
    - ***** END LICENSE BLOCK ***** -->
 <!-- Window title -->
 <!-- LOCALIZATION NOTE  (editorWindow.titlemodifier): DONT_TRANSLATE -->
 
 <!ENTITY editorWindow.titlemodifier "Composer">
 <!ENTITY editorWindow.titlemodifiermenuseparator " - ">
 <!-- Menu items:  the . means that the menu item isn't implemented yet -->
-<!-- View menu items -->
+<!-- Toolbar-only items -->
 
 
-<!ENTITY viewMenu.label "āĻĒā§āϰāĻĻāĻ°ā§āĻļāύ (V)">
-<!ENTITY viewMenu.accesskey "V">
+<!ENTITY compositionToolbar.tooltip "Composition Toolbar">
+<!ENTITY previewToolbarCmd.label "Browse">
+<!ENTITY previewToolbarCmd.tooltip "Load this page in the browser">
+<!-- File menu items -->
+
+<!ENTITY exportToTextCmd.label "Export to Textâ€Ļ">
+<!ENTITY exportToTextCmd.accesskey "T">
+<!ENTITY previewCmd.label "Browse Page">
+<!ENTITY previewCmd.accesskey "w">
+<!ENTITY sendPageCmd.label "Send Pageâ€Ļ">
+<!ENTITY sendPageCmd.accesskey "d">
+<!-- View menu items -->
+
 <!ENTITY compositionToolbarCmd.label "āĻŽā§‡āχāϞ āϰāϚāύāĻž āϟ⧁āϞāĻŦāĻžāϰ (C)">
 <!ENTITY compositionToolbarCmd.accesskey "C">
 <!ENTITY formattingToolbarCmd.label "āĻŦāĻŋāĻ¨ā§āϝāĻžāϏ āϟ⧁āϞāĻŦāĻžāϰ (F)">
 <!ENTITY formattingToolbarCmd.accesskey "F">
 <!ENTITY editmodeToolbarCmd.label "āϏāĻŽā§āĻĒāĻžāĻĻāύāĻž āĻŽā§‹āĻĄ āϟ⧁āϞāĻŦāĻžāϰ (E)">
 <!ENTITY editmodeToolbarCmd.accesskey "E">
 <!-- Format menu items -->
 
 <!ENTITY formatMenu.label "āĻŦāĻŋāĻ¨ā§āϝāĻžāϏ (o)">
 <!ENTITY formatMenu.accesskey "o">
+<!ENTITY grid.label "Positioning grid">
+<!ENTITY grid.accesskey "t">
+<!ENTITY pageProperties.label "Page Title and Propertiesâ€Ļ">
+<!ENTITY pageProperties.accesskey "g">
+<!-- Tools menu items -->
+
+<!ENTITY validateCmd.label "Validate HTML">
+<!ENTITY validateCmd.accesskey "V">
+<!-- Display Mode toolbar and View menu items -->
+
+<!ENTITY NormalModeTab.label "Normal">
+<!ENTITY NormalMode.label "Normal Edit Mode">
+<!ENTITY NormalMode.accesskey "N">
+<!ENTITY NormalMode.tooltip "Show table borders and named anchors">
+<!ENTITY AllTagsModeTab.label "HTML Tags">
+<!ENTITY AllTagsMode.label "HTML Tags">
+<!ENTITY AllTagsMode.accesskey "a">
+<!ENTITY AllTagsMode.tooltip "Display icons for all HTML tags">
+<!-- LOCALIZATION NOTE: (HTMLSourceModeTab.dir, HTMLSourceModeTab.label)
+     Do NOT translate text for 'HTMLSourceModeTab.dir', use latin "ltr" if
+     you want the <html> image to left of the 'HTMLSourceModeTab.label' text,
+     or use latin "rtl" if you want this image to the right of text. You do
+     not need to include HTML in the label 'HTMLSourceModeTab.label' -->
+<!ENTITY HTMLSourceModeTab.dir "ltr">
+<!ENTITY HTMLSourceModeTab.label "Source">
+<!ENTITY HTMLSourceMode.label "HTML Source">
+<!ENTITY HTMLSourceMode.accesskey "H">
+<!ENTITY HTMLSourceMode.tooltip "Edit HTML source">
+<!ENTITY PreviewModeTab.label "Preview">
+<!ENTITY PreviewMode.label "Preview">
+<!ENTITY PreviewMode.accesskey "P">
+<!ENTITY PreviewMode.tooltip "Display as WYSIWYG (as in the browser)">
--- a/editor/ui/chrome/composer/editor.properties
+++ b/editor/ui/chrome/composer/editor.properties
@@ -8,20 +8,21 @@ Save=āϏāĻ‚āϰāĻ•ā§āώāĻŖ āĻ•āϰ⧁āύ
 More=āφāϰāĻ“
 Less=āĻ•āĻŽ
 MoreProperties=āφāϰāĻ“ āĻŦ⧈āĻļāĻŋāĻˇā§āĻŸā§āϝ
 FewerProperties=āĻ…āĻ˛ā§āĻĒ āĻ•āĻŋāϛ⧁ āĻŦ⧈āĻļāĻŋāĻˇā§āĻŸā§āϝ
 PropertiesAccessKey=P
 None=āϕ⧋āύ⧋āϟāĻŋ āύ⧟
 none=āϕ⧋āύ⧋āϟāĻŋ āύ⧟
 OpenHTMLFile=HTML āĻĢāĻžāχāϞ āϖ⧁āϞ⧁āύ
+OpenTextFile=Open Text File
 SelectImageFile=āĻ›āĻŦāĻŋāϰ āĻĢāĻžāχāϞ āύāĻŋāĻ°ā§āĻŦāĻžāϚāύ āĻ•āϰ⧁āύ
 SaveDocument=āĻĒ⧃āĻˇā§āĻ āĻž āϏāĻ‚āϰāĻ•ā§āώāĻŖ āĻ•āϰ⧁āύ
 SaveDocumentAs=āĻāĻ­āĻžāĻŦ⧇ āĻĒ⧃āĻˇā§āĻ āĻž āϏāĻ‚āϰāĻ•ā§āώāĻŖ
-ExportToText=āĻĒāĻžāĻ ā§āϝ āĻšāĻŋāϏ⧇āĻŦ⧇ āĻāĻ•ā§āϏāĻĒā§‹āĻ°ā§āϟ
+SaveTextAs=Save Text As
 EditMode=āϏāĻŽā§āĻĒāĻžāĻĻāύāĻž āĻŽā§‹āĻĄ
 Preview=āĻĒā§āϰāĻžāĻ•āĻĻāĻ°ā§āĻļāύ
 Publish=āĻĒā§āϰāĻ•āĻžāĻļ
 PublishPage=āĻĒ⧃āĻˇā§āĻ āĻž āĻĒā§āϰāĻ•āĻžāĻļ
 DontPublish=āĻĒā§āϰāĻ•āĻžāĻļ āĻ•āϰāĻž āĻšāĻŦ⧇ āύāĻž
 SavePassword=āĻāχ āĻĒāĻžāϏāĻ“ā§ŸāĻžāĻ°ā§āĻĄāϟāĻŋ āϏāĻ‚āϰāĻ•ā§āώāĻŖ āĻ•āϰāĻžāϰ āϜāĻ¨ā§āϝ āĻĒāĻžāϏāĻ“ā§ŸāĻžāĻ°ā§āĻĄ āĻŦā§āϝāĻŦāĻ¸ā§āĻĨāĻžāĻĒāĻ• āĻŦā§āϝāĻŦāĻšāĻžāϰ āĻ•āϰ⧁āύ
 CorrectSpelling=(āϏāĻ āĻŋāĻ• āĻŦāĻžāύāĻžāύ)
 NoSuggestedWords=(āϕ⧋āύ⧋ āĻĒāϰāĻžāĻŽāĻ°ā§āĻļāĻŋāϤ āĻļāĻŦā§āĻĻ āύ⧇āχ)
--- a/editor/ui/chrome/composer/editorOverlay.dtd
+++ b/editor/ui/chrome/composer/editorOverlay.dtd
@@ -40,19 +40,16 @@
    -
    - ***** END LICENSE BLOCK ***** -->
 <!-- Attn: Localization - some of the menus in this dialog directly affect mail also. -->
 <!-- File menu items -->
 
 
 <!ENTITY fileMenu.label "āĻĢāĻžāχāϞ (F)">
 <!ENTITY fileMenu.accesskey "F">
-<!ENTITY newBlankPageCmd.label "āϰāϚāύāĻžāĻ•āĻžāϰāĻ• āĻĒ⧃āĻˇā§āĻ āĻž (P)">
-<!ENTITY newBlankPageCmd.accesskey "P">
-<!ENTITY newMenu.label "āύāϤ⧁āύ">
 <!ENTITY openFileCmd.label "āĻĢāĻžāχāϞ āϖ⧁āϞ⧁āύ... (O)">
 <!ENTITY openFileCmd.accesskey "O">
 <!ENTITY openFileCmd.key "O">
 <!ENTITY openRemoteCmd.label "āĻ“ā§Ÿā§‡āĻŦ⧇āϰ āĻ…āĻŦāĻ¸ā§āĻĨāĻžāύ āϖ⧁āϞ⧁āύ... (L)">
 <!ENTITY openRemoteCmd.accesskey "L">
 <!ENTITY openRemoteCmd.key "L">
 <!ENTITY fileRecentMenu.label "āϏāĻžāĻŽā§āĻĒā§āϰāϤāĻŋāĻ• āĻĒ⧃āĻˇā§āĻ āĻž (R)">
 <!ENTITY fileRecentMenu.accesskey "R">
@@ -64,24 +61,18 @@
 <!ENTITY saveAsCmd.label "āĻāĻ­āĻžāĻŦ⧇ āϏāĻ‚āϰāĻ•ā§āώāĻŖ āĻ•āϰ⧁āύ... (A)">
 <!ENTITY saveAsCmd.accesskey "A">
 
 <!ENTITY publishCmd.label "āĻĒā§āϰāĻ•āĻžāĻļ āĻ•āϰ⧁āύ (b)">
 <!ENTITY publishCmd.accesskey "b">
 <!ENTITY publishCmd.key "S">
 <!ENTITY publishAsCmd.label "āĻāĻ­āĻžāĻŦ⧇ āĻĒā§āϰāĻ•āĻžāĻļ āĻ•āϰ⧁āύ... (h)">
 <!ENTITY publishAsCmd.accesskey "h">
-<!ENTITY exportToTextCmd.label "āĻĒāĻžāĻ ā§āϝ⧇ āĻāĻ•ā§āϏāĻĒā§‹āĻ°ā§āϟ āĻ•āϰ⧁āύ... (T)">
-<!ENTITY exportToTextCmd.accesskey "T">
 <!ENTITY saveAsChangeEncodingCmd.label "āĻ…āĻ•ā§āώāϰ⧇āϰ āĻāύāϕ⧋āĻĄāĻŋāĻ‚ āϏāĻ‚āϰāĻ•ā§āώāĻŖ āĻāĻŦāĻ‚ āĻĒāϰāĻŋāĻŦāĻ°ā§āϤāύ āĻ•āϰ⧁āύ (E)">
 <!ENTITY saveAsChangeEncodingCmd.accesskey "E">
-<!ENTITY previewCmd.label "āĻĒ⧃āĻˇā§āĻ āĻž āĻŦā§āϰāĻžāωāϜ āĻ•āϰ⧁āύ (w)">
-<!ENTITY previewCmd.accesskey "w">
-<!ENTITY sendPageCmd.label "āĻĒ⧃āĻˇā§āĻ āĻž āĻĒāĻžāĻ āĻžāύ⧋... (d)">
-<!ENTITY sendPageCmd.accesskey "d">
 <!ENTITY printSetupCmd.label "āĻĒ⧃āĻˇā§āĻ āĻžāϰ āϏ⧇āϟāφāĻĒ... (u)">
 <!ENTITY printSetupCmd.accesskey "u">
 <!ENTITY printCmd.label "āĻŽā§āĻĻā§āϰāĻŖ... (P)">
 <!ENTITY printCmd.accesskey "P">
 <!ENTITY printCmd.key "P">
 <!ENTITY closeCmd.label "āĻŦāĻ¨ā§āϧ (C)">
 <!ENTITY closeCmd.accesskey "C">
 <!ENTITY closeCmd.key "W">
@@ -111,18 +102,16 @@
 <!ENTITY findPrevCmd.accesskey "v">
 <!ENTITY findPrevCmd.key "G">
 <!ENTITY findPrevCmd.key2 "VK_F3">
 <!ENTITY enableInlineSpellChecker.label "āϞ⧇āĻ–āĻž āĻ…āĻŦāĻ¸ā§āĻĨāĻžā§Ÿ āĻŦāĻžāύāĻžāύ āĻĒāϰ⧀āĻ•ā§āώāĻž āĻ•āϰāĻž āĻšāĻŦ⧇ (S)">
 <!ENTITY enableInlineSpellChecker.accesskey "S">
 <!ENTITY checkSpellingCmd2.label "āĻŦāĻžāύāĻžāύ āĻĒāϰ⧀āĻ•ā§āώāĻž (h)">
 <!ENTITY checkSpellingCmd2.accesskey "h">
 <!ENTITY checkSpellingCmd2.key "p">
-<!ENTITY validateCmd.label "HTML āϝāĻžāϚāĻžāχ (V)">
-<!ENTITY validateCmd.accesskey "V">
 <!-- Insert menu items -->
 
 <!ENTITY insertMenu.label "āĻĒā§āϰāĻŦ⧇āĻļ (I)">
 <!ENTITY insertMenu.accesskey "I">
 <!ENTITY insertLinkCmd.label "āϞāĻŋāĻ‚āĻ•... (L)">
 <!ENTITY insertLinkCmd.accesskey "L">
 <!ENTITY insertLinkCmd.key "L">
 <!ENTITY insertAnchorCmd.label "āύāĻžāĻŽāϏāĻš āĻ…ā§āϝāĻžāĻ‚āĻ•āϰ... (A)">
@@ -328,21 +317,16 @@
 
 <!ENTITY increaseIndent.label "āχāύāĻĄā§‡āĻ¨ā§āϟ āĻŦāĻžā§œāĻžāύ⧋ (I)">
 <!ENTITY increaseIndent.accesskey "I">
 <!ENTITY increaseIndent.key "]">
 <!ENTITY decreaseIndent.label "āχāύāĻĄā§‡āĻ¨ā§āϟ āĻ•āĻŽāĻžāύ⧋ (D)">
 <!ENTITY decreaseIndent.accesskey "D">
 <!ENTITY decreaseIndent.key "[">
 
-<!ENTITY grid.label "āĻ…āĻŦāĻ¸ā§āĻĨāĻžāύ āύāĻŋāĻ°ā§āϪ⧟āĻ•āĻžāϰ⧀ āĻ—ā§āϰāĻŋāĻĄ (t)">
-<!ENTITY grid.accesskey "t">
-
-<!ENTITY pageProperties.label "āĻĒ⧃āĻˇā§āĻ āĻžāϰ āĻļāĻŋāϰ⧋āύāĻžāĻŽ āĻāĻŦāĻ‚ āĻŦ⧈āĻļāĻŋāĻˇā§āĻŸā§āϝ... (g)">
-<!ENTITY pageProperties.accesskey "g">
 <!ENTITY colorsAndBackground.label "āĻĒ⧃āĻˇā§āĻ āĻžāϰ āϰāĻ‚ āĻāĻŦāĻ‚ āĻĒāϟāĻ­ā§‚āĻŽāĻŋ... (u)">
 <!ENTITY colorsAndBackground.accesskey "u">
 <!-- Table Menu -->
 
 <!ENTITY tableMenu.label "āϏāĻžāϰāĻŖāĻŋ (b)">
 <!ENTITY tableMenu.accesskey "b">
 <!-- Select Submenu -->
 
@@ -401,25 +385,23 @@
 <!ENTITY tableSplitCell.accesskey "C">
 <!ENTITY convertToTable.label "āύāĻŋāĻ°ā§āĻŦāĻžāϚāĻŋāϤ āĻ…āĻ‚āĻļ āĻĨ⧇āϕ⧇ āϏāĻžāϰāĻŖāĻŋ āϤ⧈āϰāĻŋ āĻ•āϰ⧁āύ (r)">
 <!ENTITY convertToTable.accesskey "r">
 <!ENTITY tableProperties.label "āϏāĻžāϰāĻŖāĻŋāϰ āĻŦ⧈āĻļāĻŋāĻˇā§āĻŸā§āϝ... (o)">
 <!ENTITY tableProperties.accesskey "o">
 <!-- Toolbar-only items -->
 
 <!ENTITY menuBar.tooltip "āĻŽā§‡āύ⧁ āĻŦāĻžāϰ">
-<!ENTITY compositionToolbar.tooltip "āĻŽā§‡āχāϞ āϰāϚāύāĻž āϟ⧁āϞāĻŦāĻžāϰ">
 <!ENTITY formatToolbar.tooltip "āĻĢāϰāĻŽā§āϝāĻžāϟ āϟ⧁āϞāĻŦāĻžāϰ">
+<!ENTITY newToolbarCmd.label "New">
 <!ENTITY newToolbarCmd.tooltip "āĻāĻ•āϟāĻŋ āύāϤ⧁āύ āϰāϚāύāĻžāĻ•āĻžāϰāĻ• āĻĒ⧃āĻˇā§āĻ āĻž āϤ⧈āϰāĻŋ āĻ•āϰ⧁āύ">
 <!ENTITY openToolbarCmd.label "āϖ⧁āϞ⧁āύ">
 <!ENTITY openToolbarCmd.tooltip "āĻāĻ•āϟāĻŋ āĻ¸ā§āĻĨāĻžāĻ¨ā§€ā§Ÿ āĻĢāĻžāχāϞ āϖ⧁āϞ⧁āύ">
 <!ENTITY saveToolbarCmd.tooltip "āĻāĻ•āϟāĻŋ āĻ¸ā§āĻĨāĻžāĻ¨ā§€ā§Ÿ āĻ…āĻŦāĻ¸ā§āĻĨāĻžāύ⧇ āĻĢāĻžāχāϞ āϏāĻ‚āϰāĻ•ā§āώāĻŖ āĻ•āϰ⧁āύ">
 <!ENTITY publishToolbarCmd.tooltip "āĻāĻ•āϟāĻŋ āĻĻā§‚āϰāĻŦāĻ°ā§āϤ⧀ āĻ…āĻŦāĻ¸ā§āĻĨāĻžāύ⧇ āĻĢāĻžāχāϞ āφāĻĒāϞ⧋āĻĄ āĻ•āϰ⧁āύ">
-<!ENTITY previewToolbarCmd.label "āĻŦā§āϰāĻžāωāϜ">
-<!ENTITY previewToolbarCmd.tooltip "āĻāχ āĻĒ⧃āĻˇā§āĻ āĻžāϟāĻŋ āĻŦā§āϰāĻžāωāϜāĻžāϰ⧇ āϞ⧋āĻĄ āĻ•āϰ⧁āύ">
 <!ENTITY printToolbarCmd.label "āĻŽā§āĻĻā§āϰāĻŖ">
 <!ENTITY printToolbarCmd.tooltip "āĻāχ āĻĒ⧃āĻˇā§āĻ āĻžāϟāĻŋ āĻŽā§āĻĻā§āϰāĻŖ āĻ•āϰ⧁āύ">
 <!ENTITY findToolbarCmd.label "āĻ…āύ⧁āϏāĻ¨ā§āϧāĻžāύ">
 <!ENTITY findToolbarCmd.tooltip "āĻĒ⧃āĻˇā§āĻ āĻžā§Ÿ āĻĒāĻžāĻ ā§āϝ āĻ…āύ⧁āϏāĻ¨ā§āϧāĻžāύ">
 <!ENTITY spellToolbarCmd.label "āĻŦāĻžāύāĻžāύ">
 <!ENTITY spellToolbarCmd.tooltip "āύāĻŋāĻ°ā§āĻŦāĻžāϚāύ⧇āϰ āĻŦāĻž āϏāĻŽā§āĻĒā§‚āĻ°ā§āĻŖ āĻĒ⧃āĻˇā§āĻ āĻžāϰ āĻŦāĻžāύāĻžāύ āĻĒāϰ⧀āĻ•ā§āώāĻž āĻ•āϰāĻž āĻšāĻŦ⧇">
 <!ENTITY imageToolbarCmd.label "āĻ›āĻŦāĻŋ">
 <!ENTITY imageToolbarCmd.tooltip "āύāϤ⧁āύ āĻ›āĻŦāĻŋ āĻĒā§āϰāĻŦ⧇āĻļ āĻŦāĻž āύāĻŋāĻ°ā§āĻŦāĻžāϚāĻŋāϤ āĻ›āĻŦāĻŋāϰ āĻŦ⧈āĻļāĻŋāĻˇā§āĻŸā§āϝ āϏāĻŽā§āĻĒāĻžāĻĻāύāĻž āĻ•āϰāĻž āĻšāĻŦ⧇">
@@ -446,53 +428,27 @@
 <!ENTITY numberListToolbarCmd.tooltip "āϏāĻ‚āĻ–ā§āϝāĻž āĻĻā§‡ā§ŸāĻž āϤāĻžāϞāĻŋāĻ•āĻž āĻ•āĻžāĻ°ā§āϝāĻ•āϰ āĻ•āϰ⧁āύ āĻŦāĻž āĻŽā§āϛ⧇ āĻĻāĻŋāύ">
 <!ENTITY outdentToolbarCmd.tooltip "āφāωāϟāĻĄā§‡āĻ¨ā§āϟ (āĻŦāĻžāĻŽā§‡ āϏāϰāĻžāύ⧋)">
 <!ENTITY indentToolbarCmd.tooltip "āχāύāĻĄā§‡āĻ¨ā§āϟ (āĻĄāĻžāύ⧇ āϏāϰāĻžāύ⧋)">
 <!ENTITY AlignPopupButton.tooltip "āĻĒāĻžāĻ ā§āϝ āĻĒā§āϰāĻžāĻ¨ā§āϤāĻŋāĻ•āĻ•āϰāĻŖ āĻŦ⧇āϛ⧇ āύāĻŋāύ">
 <!ENTITY InsertPopupButton.tooltip "āĻāĻ•āϟāĻŋ āϞāĻŋāĻ‚āĻ•, āύ⧋āĻ™ā§āĻ—āϰ, āĻ›āĻŦāĻŋ, āĻ…āύ⧁āĻ­ā§‚āĻŽāĻŋāĻ• āϰ⧇āĻ–āĻž āĻŦāĻž āϏāĻžāϰāĻŖāĻŋ āĻĒā§āϰāĻŦ⧇āĻļ āĻ•āϰāĻž āĻšāĻŦ⧇">
 <!ENTITY alignLeftButton.tooltip "āĻĒāĻžāĻ ā§āϝāϕ⧇ āĻŦāĻžāĻŽ āĻŽāĻžāĻ°ā§āϜāĻŋāύ⧇āϰ āϏāĻžāĻĨ⧇ āĻŽā§‡āϞāĻžāύ⧋ āĻšāĻŦ⧇">
 <!ENTITY alignCenterButton.tooltip "āĻĒāĻžāĻ ā§āϝāϕ⧇ āĻŽāĻžāĻ āĻŦāϰāĻžāĻŦāϰ āϏāĻžāϜāĻžāύ⧋ āĻšāĻŦ⧇">
 <!ENTITY alignRightButton.tooltip "āĻĒāĻžāĻ ā§āϝāϕ⧇ āĻĄāĻžāύ āĻŽāĻžāĻ°ā§āϜāĻŋāύ⧇āϰ āϏāĻžāĻĨ⧇ āĻŽā§‡āϞāĻžāύ⧋ āĻšāĻŦ⧇">
-<!ENTITY alignjustifyButton.tooltip "āĻĒāĻžāĻ ā§āϝāϕ⧇ āĻĄāĻžāύ āĻāĻŦāĻ‚ āĻŦāĻžāĻŽā§‡āϰ āĻŽāĻžāĻ°ā§āϜāĻŋāύ⧇āϰ āϏāĻžāĻĨ⧇ āϏāĻžāϜāĻžāύ⧋ āĻšāĻŦ⧇">
-<!-- Display Mode toolbar and View menu items -->
-
-<!ENTITY NormalModeTab.label "āϏāĻžāϧāĻžāϰāĻŖ">
-<!ENTITY NormalMode.label "āϏāĻžāϧāĻžāϰāĻŖ āϏāĻŽā§āĻĒāĻžāĻĻāύ āĻŽā§‹āĻĄ (N)">
-<!ENTITY NormalMode.accesskey "N">
-<!ENTITY NormalMode.tooltip "āϏāĻžāϰāĻŖāĻŋāϰ āϏ⧀āĻŽāĻžāύāĻž āĻāĻŦāĻ‚ āύāĻžāĻŽāϏāĻš āύ⧋āĻ™ā§āĻ—āϰ āĻĻ⧇āĻ–āĻžāύ⧋ āĻšāĻŦ⧇">
-<!ENTITY AllTagsMode.label "HTML āĻŸā§āϝāĻžāĻ— (a)">
-<!ENTITY AllTagsMode.accesskey "a">
-<!ENTITY AllTagsMode.tooltip "āϏāĻŦ HTML āĻŸā§āϝāĻžāϗ⧇āϰ āφāχāĻ•āύ āĻĻ⧇āĻ–āĻžāύ⧋ āĻšāĻŦ⧇">
-
-<!ENTITY HTMLSourceMode.label "HTML āϏ⧋āĻ°ā§āϏ (H)">
-<!-- Toolbar has an image with "HTML" text, so don't include it in the string -->
-<!ENTITY SourceMode.label "āϏ⧋āĻ°ā§āϏ">
-<!ENTITY HTMLSourceMode.accesskey "H">
-<!ENTITY HTMLSourceMode.tooltip "HTML āϏ⧋āĻ°ā§āϏ āϏāĻŽā§āĻĒāĻžāĻĻāύāĻž āĻ•āϰ⧁āύ">
-<!ENTITY PreviewMode.label "āĻĒā§āϰāĻžāĻ•āĻĻāĻ°ā§āĻļāύ (P)">
-<!ENTITY PreviewMode.accesskey "P">
-<!ENTITY PreviewMode.tooltip "WYSIWYG āĻšāĻŋāϏ⧇āĻŦ⧇ āĻĻ⧇āĻ–āĻžāύ⧋ āĻšāĻŦ⧇ (āĻŦā§āϰāĻžāωāϜāĻžāϰ⧇āϰ āĻŽāϤ)">
-<!-- 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">
+<!ENTITY alignJustifyButton.tooltip "Align text along left and right margins">
 <!-- Structure Toolbar Context Menu items -->
 
-<!ENTITY structSelect.label "āύāĻŋāĻ°ā§āĻŦāĻžāϚāύ āĻ•āϰ⧁āύ (S)">
-<!ENTITY structSelect.accesskey "S">
-<!ENTITY structRemoveTag.label "āĻŸā§āϝāĻžāĻ— āĻŽā§āϛ⧇ āĻĻāĻŋāύ (R)">
-<!ENTITY structRemoveTag.accesskey "R">
-<!ENTITY structChangeTag.label "āĻŸā§āϝāĻžāĻ— āĻĒāϰāĻŋāĻŦāĻ°ā§āϤāύ āĻ•āϰ⧁āύ (C)">
-<!ENTITY structChangeTag.accesskey "C">
+<!ENTITY structSelect.label         "āύāĻŋāĻ°ā§āĻŦāĻžāϚāύ āĻ•āϰ⧁āύ (S)">
+<!ENTITY structSelect.accesskey     "S">
+<!ENTITY structRemoveTag.label      "āĻŸā§āϝāĻžāĻ— āĻŽā§āϛ⧇ āĻĻāĻŋāύ (R)">
+<!ENTITY structRemoveTag.accesskey  "R">
+<!ENTITY structChangeTag.label      "āĻŸā§āϝāĻžāĻ— āĻĒāϰāĻŋāĻŦāĻ°ā§āϤāύ āĻ•āϰ⧁āύ (C)">
+<!ENTITY structChangeTag.accesskey  "C">
 <!-- TOC manipulation -->
 
-<!ENTITY insertTOC.label "āĻĒā§āϰāĻŦ⧇āĻļ (I)">
-<!ENTITY insertTOC.accesskey "I">
-<!ENTITY updateTOC.label "āĻšāĻžāϞāύāĻžāĻ—āĻžāĻĻ (U)">
-<!ENTITY updateTOC.accesskey "U">
-<!ENTITY removeTOC.label "āĻŽā§āϛ⧇ āĻĻāĻŋāύ (R)">
-<!ENTITY removeTOC.accesskey "R">
-<!ENTITY tocMenu.label "āϏ⧂āĻšā§€āĻĒāĻ¤ā§āϰ... (b)">
-<!ENTITY tocMenu.accesskey "b">
+<!ENTITY insertTOC.label          "āĻĒā§āϰāĻŦ⧇āĻļ (I)">
+<!ENTITY insertTOC.accesskey      "I">
+<!ENTITY updateTOC.label          "āĻšāĻžāϞāύāĻžāĻ—āĻžāĻĻ (U)">
+<!ENTITY updateTOC.accesskey      "U">
+<!ENTITY removeTOC.label          "āĻŽā§āϛ⧇ āĻĻāĻŋāύ (R)">
+<!ENTITY removeTOC.accesskey      "R">
+<!ENTITY tocMenu.label            "āϏ⧂āĻšā§€āĻĒāĻ¤ā§āϰ... (b)">
+<!ENTITY tocMenu.accesskey        "b">
--- a/editor/ui/chrome/composer/pref-composer.dtd
+++ b/editor/ui/chrome/composer/pref-composer.dtd
@@ -1,25 +1,25 @@
 <!-- extracted from content/pref-composer.xul -->
 <!--LOCALIZATION NOTE : FILE 'Composer' prefs dialog. Similar to Communcator 4.x Document Properties/Colors and Background -->
 <!--LOCALIZATION NOTE (pref.composer.title): DONT_TRANSLATE -->
 
 
-<!ENTITY pref.composer.title "Composer">
-<!ENTITY recentFiles.title "āϏāĻžāĻŽā§āĻĒā§āϰāϤāĻŋāĻ• āĻĒ⧃āĻˇā§āĻ āĻžāϰ āĻŽā§‡āύ⧁">
-<!ENTITY documentsInMenu.label "āϤāĻžāϞāĻŋāĻ•āĻžāĻ•ā§ƒāϤ āĻĒ⧃āĻˇā§āĻ āĻžāϰ āϏāĻ°ā§āĻŦā§‹āĻšā§āϚ āϏāĻ‚āĻ–ā§āϝāĻž (n):">
-<!ENTITY documentsInMenu.accesskey "n">
-<!ENTITY savingFiles.title "āϝāĻ–āύ āĻĒ⧃āĻˇā§āĻ āĻž āϏāĻ‚āϰāĻ•ā§āώāĻŖ āĻŦāĻž āĻĒā§āϰāĻ•āĻžāĻļ āĻ•āϰāĻž āĻšāĻŦ⧇">
-<!ENTITY preserveExisting.label "āφāϏāϞ āϏ⧋āĻ°ā§āϏ āĻŦāĻŋāĻ¨ā§āϝāĻžāϏ āϏāĻ‚āϰāĻ•ā§āώāĻŖ āĻ•āϰāĻž āĻšāĻŦ⧇ (P)">
-<!ENTITY preserveExisting.accesskey "P">
-<!ENTITY preserveExisting.tooltip "āϞāĻžāχāύ āĻŦā§āϰ⧇āĻ• āĻāĻŦāĻ‚ āĻĒ⧃āĻˇā§āĻ āĻžāϰ āφāϏāϞ āĻŦāĻŋāĻ¨ā§āϝāĻžāϏ āϏāĻ‚āϰāĻ•ā§āώāĻŖ āĻ•āϰāĻž āĻšāĻŦ⧇">
-<!ENTITY saveAssociatedFiles.label "āĻĒ⧃āĻˇā§āĻ āĻž āϏāĻ‚āϰāĻ•ā§āώāϪ⧇āϰ āϏāĻŽā§Ÿ āĻ›āĻŦāĻŋ āĻāĻŦāĻ‚ āĻ…āĻ¨ā§āϝāĻžāĻ¨ā§āϝ āϏāĻ‚āĻļā§āϞāĻŋāĻˇā§āϟ āĻĢāĻžāχāϞ āϏāĻ‚āϰāĻ•ā§āώāĻŖ āĻ•āϰāĻž āĻšāĻŦ⧇ (S)">
-<!ENTITY saveAssociatedFiles.accesskey "S">
-<!ENTITY showPublishDialog.label "āĻĒ⧃āĻˇā§āĻ āĻž āĻĒā§āϰāĻ•āĻžāĻļ⧇āϰ āϏāĻŽā§Ÿ āĻĒā§āϰāĻ•āĻžāĻļ⧇āϰ āĻĄāĻžā§ŸāϞāĻ— āϏāĻ°ā§āĻŦāĻĻāĻž āĻĻ⧇āĻ–āĻžāύ⧋ āĻšāĻŦ⧇ (A)">
-<!ENTITY showPublishDialog.accesskey "A">
-<!ENTITY composerEditing.label "āϏāĻŽā§āĻĒāĻžāĻĻāύāĻž āĻ•āϰāĻž āĻšāĻšā§āϛ⧇">
-<!ENTITY maintainStructure.label "āϝāĻ–āύ āϘāϰ āĻĒā§āϰāĻŦ⧇āĻļ āĻŦāĻž āĻŽā§āϛ⧇ āĻĻā§‡ā§ŸāĻž āĻšāĻŦ⧇, āϤāĻ–āύ āϏāĻžāϰāĻŖāĻŋāϰ āĻŦāĻ°ā§āĻšāĻŋāĻŦāĻŋāĻ¨ā§āϝāĻžāϏ āĻŦāϜāĻžā§Ÿ āϰāĻžāĻ–āĻž āĻšāĻŦ⧇ (M)">
-<!ENTITY maintainStructure.tooltip "āϘāϰ āĻĒā§āϰāĻŦ⧇āĻļ āĻŦāĻž āĻŽā§āϛ⧇ āĻĢ⧇āϞāĻžāϰ āĻĒāϰ⧇ āĻ¸ā§āĻŦ⧟āĻ‚āĻ•ā§āϰāĻŋ⧟āĻ­āĻžāĻŦ⧇ āϘāϰ āϝ⧋āĻ— āĻ•āϰāĻžāϰ āĻŽāĻžāĻ§ā§āϝāĻŽā§‡ āϏāĻžāϰāĻŖāĻŋāϰ āĻ†ā§ŸāϤāĻ•ā§āώ⧇āĻ¤ā§āϰāĻžāĻ•āĻžāϰ āϏāĻ‚āϰāĻ•ā§āώāĻŖ āĻ•āϰāĻž āĻšāĻŦ⧇">
-<!ENTITY maintainStructure.accesskey "M">
-<!ENTITY useCSS.label "HTML āωāĻĒāĻžāĻĻāĻžāύ āĻāĻŦāĻ‚ āĻŦ⧈āĻļāĻŋāĻˇā§āĻŸā§āϝ⧇āϰ āĻĒāϰāĻŋāĻŦāĻ°ā§āϤ⧇ CSS āĻļ⧈āϞ⧀ āĻŦā§āϝāĻŦāĻšāĻžāϰ āĻ•āϰāĻž āĻšāĻŦ⧇ (U)">
-<!ENTITY useCSS.accesskey "U">
-<!ENTITY crInPCreatesNewP.label "āĻ…āύ⧁āĻšā§āϛ⧇āĻĻ⧇ āĻĢ⧇āϰāϤ āφāϏāϞ⧇, āϏāĻŦāϏāĻŽā§Ÿ āĻāĻ•āϟāĻŋ āύāϤ⧁āύ āĻ…āύ⧁āĻšā§āϛ⧇āĻĻ āϤ⧈āϰāĻŋ āĻ•āϰāĻž āĻšāĻŦ⧇ (R)">
-<!ENTITY crInPCreatesNewP.accesskey "R">
+<!ENTITY  pref.composer.title           "Composer">
+<!ENTITY  recentFiles.title             "āϏāĻžāĻŽā§āĻĒā§āϰāϤāĻŋāĻ• āĻĒ⧃āĻˇā§āĻ āĻžāϰ āĻŽā§‡āύ⧁">
+<!ENTITY  documentsInMenu.label         "āϤāĻžāϞāĻŋāĻ•āĻžāĻ•ā§ƒāϤ āĻĒ⧃āĻˇā§āĻ āĻžāϰ āϏāĻ°ā§āĻŦā§‹āĻšā§āϚ āϏāĻ‚āĻ–ā§āϝāĻž (n):">
+<!ENTITY  documentsInMenu.accesskey     "n">
+<!ENTITY  savingFiles.title             "āϝāĻ–āύ āĻĒ⧃āĻˇā§āĻ āĻž āϏāĻ‚āϰāĻ•ā§āώāĻŖ āĻŦāĻž āĻĒā§āϰāĻ•āĻžāĻļ āĻ•āϰāĻž āĻšāĻŦ⧇">
+<!ENTITY  preserveExisting.label        "āφāϏāϞ āϏ⧋āĻ°ā§āϏ āĻŦāĻŋāĻ¨ā§āϝāĻžāϏ āϏāĻ‚āϰāĻ•ā§āώāĻŖ āĻ•āϰāĻž āĻšāĻŦ⧇ (P)">
+<!ENTITY  preserveExisting.accesskey    "P">
+<!ENTITY  preserveExisting.tooltip      "āϞāĻžāχāύ āĻŦā§āϰ⧇āĻ• āĻāĻŦāĻ‚ āĻĒ⧃āĻˇā§āĻ āĻžāϰ āφāϏāϞ āĻŦāĻŋāĻ¨ā§āϝāĻžāϏ āϏāĻ‚āϰāĻ•ā§āώāĻŖ āĻ•āϰāĻž āĻšāĻŦ⧇">
+<!ENTITY  saveAssociatedFiles.label     "āĻĒ⧃āĻˇā§āĻ āĻž āϏāĻ‚āϰāĻ•ā§āώāϪ⧇āϰ āϏāĻŽā§Ÿ āĻ›āĻŦāĻŋ āĻāĻŦāĻ‚ āĻ…āĻ¨ā§āϝāĻžāĻ¨ā§āϝ āϏāĻ‚āĻļā§āϞāĻŋāĻˇā§āϟ āĻĢāĻžāχāϞ āϏāĻ‚āϰāĻ•ā§āώāĻŖ āĻ•āϰāĻž āĻšāĻŦ⧇ (S)">
+<!ENTITY  saveAssociatedFiles.accesskey "S">
+<!ENTITY  showPublishDialog.label       "āĻĒ⧃āĻˇā§āĻ āĻž āĻĒā§āϰāĻ•āĻžāĻļ⧇āϰ āϏāĻŽā§Ÿ āĻĒā§āϰāĻ•āĻžāĻļ⧇āϰ āĻĄāĻžā§ŸāϞāĻ— āϏāĻ°ā§āĻŦāĻĻāĻž āĻĻ⧇āĻ–āĻžāύ⧋ āĻšāĻŦ⧇ (A)">
+<!ENTITY  showPublishDialog.accesskey   "A">
+<!ENTITY  composerEditing.label         "āϏāĻŽā§āĻĒāĻžāĻĻāύāĻž āĻ•āϰāĻž āĻšāĻšā§āϛ⧇">
+<!ENTITY  maintainStructure.label       "āϝāĻ–āύ āϘāϰ āĻĒā§āϰāĻŦ⧇āĻļ āĻŦāĻž āĻŽā§āϛ⧇ āĻĻā§‡ā§ŸāĻž āĻšāĻŦ⧇, āϤāĻ–āύ āϏāĻžāϰāĻŖāĻŋāϰ āĻŦāĻ°ā§āĻšāĻŋāĻŦāĻŋāĻ¨ā§āϝāĻžāϏ āĻŦāϜāĻžā§Ÿ āϰāĻžāĻ–āĻž āĻšāĻŦ⧇ (M)">
+<!ENTITY  maintainStructure.tooltip     "āϘāϰ āĻĒā§āϰāĻŦ⧇āĻļ āĻŦāĻž āĻŽā§āϛ⧇ āĻĢ⧇āϞāĻžāϰ āĻĒāϰ⧇ āĻ¸ā§āĻŦ⧟āĻ‚āĻ•ā§āϰāĻŋ⧟āĻ­āĻžāĻŦ⧇ āϘāϰ āϝ⧋āĻ— āĻ•āϰāĻžāϰ āĻŽāĻžāĻ§ā§āϝāĻŽā§‡ āϏāĻžāϰāĻŖāĻŋāϰ āĻ†ā§ŸāϤāĻ•ā§āώ⧇āĻ¤ā§āϰāĻžāĻ•āĻžāϰ āϏāĻ‚āϰāĻ•ā§āώāĻŖ āĻ•āϰāĻž āĻšāĻŦ⧇">
+<!ENTITY  maintainStructure.accesskey   "M">
+<!ENTITY  useCSS.label                  "HTML āωāĻĒāĻžāĻĻāĻžāύ āĻāĻŦāĻ‚ āĻŦ⧈āĻļāĻŋāĻˇā§āĻŸā§āϝ⧇āϰ āĻĒāϰāĻŋāĻŦāĻ°ā§āϤ⧇ CSS āĻļ⧈āϞ⧀ āĻŦā§āϝāĻŦāĻšāĻžāϰ āĻ•āϰāĻž āĻšāĻŦ⧇ (U)">
+<!ENTITY  useCSS.accesskey              "U">
+<!ENTITY  crInPCreatesNewP.label        "āĻ…āύ⧁āĻšā§āϛ⧇āĻĻ⧇ āĻĢ⧇āϰāϤ āφāϏāϞ⧇, āϏāĻŦāϏāĻŽā§Ÿ āĻāĻ•āϟāĻŋ āύāϤ⧁āύ āĻ…āύ⧁āĻšā§āϛ⧇āĻĻ āϤ⧈āϰāĻŋ āĻ•āϰāĻž āĻšāĻŦ⧇ (R)">
+<!ENTITY  crInPCreatesNewP.accesskey    "R">
--- a/editor/ui/chrome/composer/pref-editing.dtd
+++ b/editor/ui/chrome/composer/pref-editing.dtd
@@ -1,28 +1,28 @@
-<!ENTITY pref.editing.title "āύāϤ⧁āύ āĻĒ⧃āĻˇā§āĻ āĻžāϰ āϏ⧇āϟāĻŋāĻ‚">
+<!ENTITY  pref.editing.title        "āύāϤ⧁āύ āĻĒ⧃āĻˇā§āĻ āĻžāϰ āϏ⧇āϟāĻŋāĻ‚">
 
-<!ENTITY authorName.label "āϞ⧇āĻ–āĻ• (u):">
-<!ENTITY authorName.accesskey "u">
-<!ENTITY pageColorHeader "āĻĒ⧃āĻˇā§āĻ āĻžāϰ āĻĒā§‚āĻ°ā§āĻŦāύāĻŋāĻ°ā§āϧāĻžāϰāĻŋāϤ āϰ⧂āĻĒ">
+<!ENTITY  authorName.label          "āϞ⧇āĻ–āĻ• (u):">
+<!ENTITY  authorName.accesskey      "u">
+<!ENTITY  pageColorHeader           "āĻĒ⧃āĻˇā§āĻ āĻžāϰ āĻĒā§‚āĻ°ā§āĻŦāύāĻŋāĻ°ā§āϧāĻžāϰāĻŋāϤ āϰ⧂āĻĒ">
 
-<!ENTITY defaultColors.label "āĻĒāĻžāĻ āϕ⧇āϰ āĻĒā§‚āĻ°ā§āĻŦāύāĻŋāĻ°ā§āϧāĻžāϰāĻŋāϤ āϰāĻ‚ (āĻĒ⧃āĻˇā§āĻ āĻžā§Ÿ āϰāĻ‚ āĻĻā§‡ā§ŸāĻž āĻšāĻŦ⧇ āύāĻž (D))">
-<!ENTITY defaultColors.accesskey "D">
-<!ENTITY customColors.label "āĻ¸ā§āĻŦāύāĻŋāĻ°ā§āĻŦāĻžāϚāĻŋāϤ āϰāĻ‚ āĻŦā§āϝāĻŦāĻšāĻžāϰ āĻ•āϰ⧁āύ (c):">
-<!ENTITY customColors.accesskey "c">
+<!ENTITY defaultColors.label        "āĻĒāĻžāĻ āϕ⧇āϰ āĻĒā§‚āĻ°ā§āĻŦāύāĻŋāĻ°ā§āϧāĻžāϰāĻŋāϤ āϰāĻ‚ (āĻĒ⧃āĻˇā§āĻ āĻžā§Ÿ āϰāĻ‚ āĻĻā§‡ā§ŸāĻž āĻšāĻŦ⧇ āύāĻž (D))">
+<!ENTITY defaultColors.accesskey    "D">
+<!ENTITY customColors.label         "āĻ¸ā§āĻŦāύāĻŋāĻ°ā§āĻŦāĻžāϚāĻŋāϤ āϰāĻ‚ āĻŦā§āϝāĻŦāĻšāĻžāϰ āĻ•āϰ⧁āύ (c):">
+<!ENTITY customColors.accesskey     "c">
 
-<!ENTITY normalText.label "āϏāĻžāϧāĻžāϰāĻŖ āĻŸā§‡āĻ•ā§āϏāϟ (N)">
-<!ENTITY normalText.accesskey "N">
-<!ENTITY linkText.label "āĻŸā§‡āĻ•ā§āϏāϟ āϏāĻ‚āϝ⧁āĻ•ā§āϤ āĻ•āϰāĻž āĻšāĻŦ⧇ (L)">
-<!ENTITY linkText.accesskey "L">
-<!ENTITY activeLinkText.label "āϏāĻ•ā§āϰāĻŋ⧟ āϞāĻŋāĻ‚āĻ• āĻŸā§‡āĻ•ā§āϏāϟ (A)">
-<!ENTITY activeLinkText.accesskey "A">
-<!ENTITY visitedLinkText.label "āĻĒā§āϰāĻĻāĻ°ā§āĻļāĻŋāϤ āϞāĻŋāĻ‚āĻ• āĻŸā§‡āĻ•ā§āϏāϟ (V)">
-<!ENTITY visitedLinkText.accesskey "V">
-<!ENTITY background.label "āĻĒāϟāĻ­ā§‚āĻŽāĻŋ (B):">
-<!ENTITY background.accesskey "B">
-<!ENTITY colon.character ":">
+<!ENTITY normalText.label           "āϏāĻžāϧāĻžāϰāĻŖ āĻŸā§‡āĻ•ā§āϏāϟ (N)">
+<!ENTITY normalText.accesskey       "N">
+<!ENTITY linkText.label             "āĻŸā§‡āĻ•ā§āϏāϟ āϏāĻ‚āϝ⧁āĻ•ā§āϤ āĻ•āϰāĻž āĻšāĻŦ⧇ (L)">
+<!ENTITY linkText.accesskey         "L">
+<!ENTITY activeLinkText.label       "āϏāĻ•ā§āϰāĻŋ⧟ āϞāĻŋāĻ‚āĻ• āĻŸā§‡āĻ•ā§āϏāϟ (A)">
+<!ENTITY activeLinkText.accesskey   "A">
+<!ENTITY visitedLinkText.label      "āĻĒā§āϰāĻĻāĻ°ā§āĻļāĻŋāϤ āϞāĻŋāĻ‚āĻ• āĻŸā§‡āĻ•ā§āϏāϟ (V)">
+<!ENTITY visitedLinkText.accesskey  "V">
+<!ENTITY background.label           "āĻĒāϟāĻ­ā§‚āĻŽāĻŋ (B):">
+<!ENTITY background.accesskey       "B">
+<!ENTITY colon.character            ":">
 
-<!ENTITY backgroundImage.label "āĻĒāϟāĻ­ā§‚āĻŽāĻŋāϰ āĻ›āĻŦāĻŋ (m):">
-<!ENTITY backgroundImage.accesskey "m">
-<!ENTITY chooseFile.label "āĻĢāĻžāχāϞ āĻŦ⧇āϛ⧇ āύāĻŋāύ... (o)">
-<!ENTITY chooseFile.accesskey "o">
+<!ENTITY backgroundImage.label      "āĻĒāϟāĻ­ā§‚āĻŽāĻŋāϰ āĻ›āĻŦāĻŋ (m):">
+<!ENTITY backgroundImage.accesskey  "m">
+<!ENTITY chooseFile.label           "āĻĢāĻžāχāϞ āĻŦ⧇āϛ⧇ āύāĻŋāύ... (o)">
+<!ENTITY chooseFile.accesskey       "o">
 
--- a/editor/ui/chrome/composer/pref-toolbars.dtd
+++ b/editor/ui/chrome/composer/pref-toolbars.dtd
@@ -29,43 +29,43 @@
    - use your version of this file under the terms of the MPL, indicate your
    - decision by deleting the provisions above and replace them with the notice
    - and other provisions required by the LGPL or the GPL. If you do not delete
    - the provisions above, a recipient may use your version of this file under
    - the terms of any one of the MPL, the GPL or the LGPL.
    -
    - ***** END LICENSE BLOCK ***** -->
 
-<!ENTITY pref.toolbars.title "āϟ⧁āϞāĻŦāĻžāϰ">
+<!ENTITY pref.toolbars.title    "āϟ⧁āϞāĻŦāĻžāϰ">
 
-<!ENTITY composition.caption "āĻāχ āĻŦā§‹āϤāĻžāĻŽāϗ⧁āϞ⧋ āĻŽā§‡āχāϞ āϰāϚāύāĻž āϟ⧁āϞāĻŦāĻžāϰ⧇ āĻĒā§āϰāĻĻāĻ°ā§āĻļāύ āĻ•āϰāĻž āĻšāĻŦ⧇:">
+<!ENTITY composition.caption    "āĻāχ āĻŦā§‹āϤāĻžāĻŽāϗ⧁āϞ⧋ āĻŽā§‡āχāϞ āϰāϚāύāĻž āϟ⧁āϞāĻŦāĻžāϰ⧇ āĻĒā§āϰāĻĻāĻ°ā§āĻļāύ āĻ•āϰāĻž āĻšāĻŦ⧇:">
 
-<!ENTITY new.label "āύāϤ⧁āύ">
-<!ENTITY open.label "āϖ⧁āϞ⧁āύ">
-<!ENTITY save.label "āϏāĻ‚āϰāĻ•ā§āώāĻŖ">
-<!ENTITY publish.label "āĻĒā§āϰāĻ•āĻžāĻļ">
-<!ENTITY preview.label "āĻŦā§āϰāĻžāωāϜ">
-<!ENTITY cut.label "āĻ•āĻžāϟāĻž">
-<!ENTITY copy.label "āĻ…āύ⧁āϞāĻŋāĻĒāĻŋ">
-<!ENTITY paste.label "āĻĒā§āϰāϤāĻŋāϞ⧇āĻĒāύ">
-<!ENTITY print.label "āĻŽā§āĻĻā§āϰāĻŖ">
-<!ENTITY find.label "āϖ⧁āρāϜ⧁āύ">
-<!ENTITY image.label "āĻ›āĻŦāĻŋ">
-<!ENTITY hline.label "āĻ…āύ⧁āĻ­ā§‚āĻŽāĻŋāĻ• āϰ⧇āĻ–āĻž">
-<!ENTITY table.label "āϏāĻžāϰāĻŖāĻŋ">
-<!ENTITY link.label "āϞāĻŋāĻ‚āĻ•">
-<!ENTITY anchor.label "āύ⧋āĻ™ā§āĻ—āϰ">
+<!ENTITY new.label              "āύāϤ⧁āύ">
+<!ENTITY open.label             "āϖ⧁āϞ⧁āύ">
+<!ENTITY save.label             "āϏāĻ‚āϰāĻ•ā§āώāĻŖ">
+<!ENTITY publish.label          "āĻĒā§āϰāĻ•āĻžāĻļ">
+<!ENTITY preview.label          "āĻŦā§āϰāĻžāωāϜ">
+<!ENTITY cut.label              "āĻ•āĻžāϟāĻž">
+<!ENTITY copy.label             "āĻ…āύ⧁āϞāĻŋāĻĒāĻŋ">
+<!ENTITY paste.label            "āĻĒā§āϰāϤāĻŋāϞ⧇āĻĒāύ">
+<!ENTITY print.label            "āĻŽā§āĻĻā§āϰāĻŖ">
+<!ENTITY find.label             "āϖ⧁āρāϜ⧁āύ">
+<!ENTITY image.label            "āĻ›āĻŦāĻŋ">
+<!ENTITY hline.label            "āĻ…āύ⧁āĻ­ā§‚āĻŽāĻŋāĻ• āϰ⧇āĻ–āĻž">
+<!ENTITY table.label            "āϏāĻžāϰāĻŖāĻŋ">
+<!ENTITY link.label             "āϞāĻŋāĻ‚āĻ•">
+<!ENTITY anchor.label           "āύ⧋āĻ™ā§āĻ—āϰ">
 
-<!ENTITY formatting.caption "āĻāχ āĻŦā§‹āϤāĻžāĻŽāϗ⧁āϞ⧋ āĻŦāĻŋāĻ¨ā§āϝāĻžāϏ āϟ⧁āϞāĻŦāĻžāϰ⧇ āĻĒā§āϰāĻĻāĻ°ā§āĻļāύ āĻ•āϰāĻž āĻšāĻŦ⧇:">
+<!ENTITY formatting.caption     "āĻāχ āĻŦā§‹āϤāĻžāĻŽāϗ⧁āϞ⧋ āĻŦāĻŋāĻ¨ā§āϝāĻžāϏ āϟ⧁āϞāĻŦāĻžāϰ⧇ āĻĒā§āϰāĻĻāĻ°ā§āĻļāύ āĻ•āϰāĻž āĻšāĻŦ⧇:">
 
-<!ENTITY smaller.label "āĻ…āĻĒ⧇āĻ•ā§āώāĻžāĻ•ā§ƒāϤ āϛ⧋āϟ">
-<!ENTITY larger.label "āĻ…āĻĒ⧇āĻ•ā§āώāĻžāĻ•ā§ƒāϤ āĻŦ⧜">
-<!ENTITY bold.label "āĻ—āĻžā§">
-<!ENTITY bullets.label "āĻŦ⧁āϞ⧇āϟ">
-<!ENTITY numbers.label "āϏāĻ‚āĻ–ā§āϝāĻž">
-<!ENTITY italic.label "āϤ⧀āĻ°ā§āϝāĻ•">
-<!ENTITY outdent.label "āφāωāϟāĻĄā§‡āĻ¨ā§āϟ">
-<!ENTITY indent.label "āχāύāĻĄā§‡āĻ¨ā§āϟ">
-<!ENTITY underline.label "āύāĻŋāĻšā§‡ āĻĻāĻžāĻ—">
+<!ENTITY smaller.label          "āĻ…āĻĒ⧇āĻ•ā§āώāĻžāĻ•ā§ƒāϤ āϛ⧋āϟ">
+<!ENTITY larger.label           "āĻ…āĻĒ⧇āĻ•ā§āώāĻžāĻ•ā§ƒāϤ āĻŦ⧜">
+<!ENTITY bold.label             "āĻ—āĻžā§">
+<!ENTITY bullets.label          "āĻŦ⧁āϞ⧇āϟ">
+<!ENTITY numbers.label          "āϏāĻ‚āĻ–ā§āϝāĻž">
+<!ENTITY italic.label           "āϤ⧀āĻ°ā§āϝāĻ•">
+<!ENTITY outdent.label          "āφāωāϟāĻĄā§‡āĻ¨ā§āϟ">
+<!ENTITY indent.label           "āχāύāĻĄā§‡āĻ¨ā§āϟ">
+<!ENTITY underline.label        "āύāĻŋāĻšā§‡ āĻĻāĻžāĻ—">
 
 <!ENTITY absolutePosition.label "āĻĒāϰāĻŽ āĻ…āĻŦāĻ¸ā§āĻĨāĻžāύ">
-<!ENTITY decreaseZIndex.label "āĻĒāĻŋāĻ›āύ⧇ āĻĒāĻžāĻ āĻžāύ⧋">
-<!ENTITY increaseZIndex.label "āϏāĻžāĻŽāύ⧇ āφāύāĻž">
+<!ENTITY decreaseZIndex.label   "āĻĒāĻŋāĻ›āύ⧇ āĻĒāĻžāĻ āĻžāύ⧋">
+<!ENTITY increaseZIndex.label   "āϏāĻžāĻŽāύ⧇ āφāύāĻž">
--- a/editor/ui/chrome/dialogs/EdAdvancedEdit.dtd
+++ b/editor/ui/chrome/dialogs/EdAdvancedEdit.dtd
@@ -31,22 +31,22 @@
    - use your version of this file under the terms of the MPL, indicate your
    - decision by deleting the provisions above and replace them with the notice
    - and other provisions required by the GPL or the LGPL. If you do not delete
    - the provisions above, a recipient may use your version of this file under
    - the terms of any one of the MPL, the GPL or the LGPL.
    -
    - ***** END LICENSE BLOCK ***** -->
 
-<!ENTITY WindowTitle.label "āωāĻšā§āϚ āĻĒāĻ°ā§āϝāĻžā§Ÿā§‡āϰ āĻŦ⧈āĻļāĻŋāĻˇā§āĻŸā§āϝ āϏāĻŽā§āĻĒāĻžāĻĻāĻ•">
-<!ENTITY AttName.label "āĻŦ⧈āĻļāĻŋāĻˇā§āĻŸā§āϝ: ">
-<!ENTITY AttValue.label "āĻŽāĻžāύ: ">
-<!ENTITY PropertyName.label "āĻŦ⧈āĻļāĻŋāĻˇā§āĻŸā§āϝ: ">
-<!ENTITY currentattributesfor.label "āĻŦāĻ°ā§āϤāĻŽāĻžāύ āĻŦ⧈āĻļāĻŋāĻˇā§āĻŸā§āϝ:">
-<!ENTITY tree.attributeHeader.label "āĻŦ⧈āĻļāĻŋāĻˇā§āĻŸā§āϝ">
-<!ENTITY tree.propertyHeader.label "āĻŦ⧈āĻļāĻŋāĻˇā§āĻŸā§āϝ">
-<!ENTITY tree.valueHeader.label "āĻŽāĻžāύ">
-<!ENTITY tabHTML.label "HTML āĻŦ⧈āĻļāĻŋāĻˇā§āĻŸā§āϝ">
-<!ENTITY tabCSS.label "āχāύāϞāĻžāχāύ āĻļ⧈āϞ⧀">
-<!ENTITY tabJSE.label "āϜāĻžāĻ­āĻžāĻ¸ā§āĻ•ā§āϰāĻŋāĻĒā§āϟ āχāϭ⧇āĻ¨ā§āϟ">
+<!ENTITY WindowTitle.label              "āωāĻšā§āϚ āĻĒāĻ°ā§āϝāĻžā§Ÿā§‡āϰ āĻŦ⧈āĻļāĻŋāĻˇā§āĻŸā§āϝ āϏāĻŽā§āĻĒāĻžāĻĻāĻ•">
+<!ENTITY AttName.label                  "āĻŦ⧈āĻļāĻŋāĻˇā§āĻŸā§āϝ: ">
+<!ENTITY AttValue.label                 "āĻŽāĻžāύ: ">
+<!ENTITY PropertyName.label             "āĻŦ⧈āĻļāĻŋāĻˇā§āĻŸā§āϝ: ">
+<!ENTITY currentattributesfor.label     "āĻŦāĻ°ā§āϤāĻŽāĻžāύ āĻŦ⧈āĻļāĻŋāĻˇā§āĻŸā§āϝ:">
+<!ENTITY tree.attributeHeader.label     "āĻŦ⧈āĻļāĻŋāĻˇā§āĻŸā§āϝ">
+<!ENTITY tree.propertyHeader.label      "āĻŦ⧈āĻļāĻŋāĻˇā§āĻŸā§āϝ">
+<!ENTITY tree.valueHeader.label         "āĻŽāĻžāύ">
+<!ENTITY tabHTML.label                  "HTML āĻŦ⧈āĻļāĻŋāĻˇā§āĻŸā§āϝ">
+<!ENTITY tabCSS.label                   "āχāύāϞāĻžāχāύ āĻļ⧈āϞ⧀">
+<!ENTITY tabJSE.label                   "āϜāĻžāĻ­āĻžāĻ¸ā§āĻ•ā§āϰāĻŋāĻĒā§āϟ āχāϭ⧇āĻ¨ā§āϟ">
 
-<!ENTITY editAttribute.label "āĻŽāĻžāύ āϏāĻŽā§āĻĒāĻžāĻĻāύāĻž āĻ•āϰāĻžāϰ āϜāĻ¨ā§āϝ āωāĻĒāϰ⧇āϰ āϝ⧇āϕ⧋āύ⧋ āφāχāĻŸā§‡āĻŽā§‡ āĻ•ā§āϞāĻŋāĻ• āĻ•āϰ⧁āύ">
-<!ENTITY removeAttribute.label "āĻŽā§āϛ⧇ āĻĢ⧇āϞāĻž">
+<!ENTITY editAttribute.label    "āĻŽāĻžāύ āϏāĻŽā§āĻĒāĻžāĻĻāύāĻž āĻ•āϰāĻžāϰ āϜāĻ¨ā§āϝ āωāĻĒāϰ⧇āϰ āϝ⧇āϕ⧋āύ⧋ āφāχāĻŸā§‡āĻŽā§‡ āĻ•ā§āϞāĻŋāĻ• āĻ•āϰ⧁āύ">
+<!ENTITY removeAttribute.label  "āĻŽā§āϛ⧇ āĻĢ⧇āϞāĻž">
--- a/editor/ui/chrome/dialogs/EdConvertToTable.dtd
+++ b/editor/ui/chrome/dialogs/EdConvertToTable.dtd
@@ -33,16 +33,16 @@
    - 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 ***** -->
 <!-- Window title -->
 
 
 <!ENTITY windowTitle.label "āϏāĻžāϰāĻŖāĻŋāϤ⧇ āϰ⧂āĻĒāĻžāĻ¨ā§āϤāϰ">
-<!ENTITY instructions1.label "āύāĻŋāĻ°ā§āĻŦāĻžāϚāĻŋāϤ āĻĒā§āϰāϤāĻŋāϟāĻŋ āĻ…āύ⧁āĻšā§āϛ⧇āĻĻ⧇āϰ āϜāĻ¨ā§āϝ āϰāϚāύāĻžāĻ•āĻžāϰāĻ• āĻāĻ•āϟāĻŋ āύāϤ⧁āύ āϏāĻžāϰāĻŖāĻŋ āϏāĻžāϰāĻŋ āϤ⧈āϰ⧀ āĻ•āϰ⧇āĨ¤">
-<!ENTITY instructions2.label "āĻ•āϞāĻžāĻŽāϗ⧁āϞ⧋āϤ⧇ āύāĻŋāĻ°ā§āĻŦāĻžāϚāύ āφāϞāĻžāĻĻāĻž āĻ•āϰāϤ⧇ āĻŦā§āϝāĻŦāĻšā§ƒāϤ āĻ…āĻ•ā§āώāϰ āĻŦ⧇āϛ⧇ āύāĻŋāύ:">
-<!ENTITY commaRadio.label "āĻ•āĻŽāĻž">
-<!ENTITY spaceRadio.label "āĻĢāĻžāρāĻ•āĻž āĻ¸ā§āĻĨāĻžāύ">
-<!ENTITY otherRadio.label "āĻ…āĻ¨ā§āϝāĻžāĻ¨ā§āϝ āĻ…āĻ•ā§āώāϰ:">
+<!ENTITY instructions1.label   "āύāĻŋāĻ°ā§āĻŦāĻžāϚāĻŋāϤ āĻĒā§āϰāϤāĻŋāϟāĻŋ āĻ…āύ⧁āĻšā§āϛ⧇āĻĻ⧇āϰ āϜāĻ¨ā§āϝ āϰāϚāύāĻžāĻ•āĻžāϰāĻ• āĻāĻ•āϟāĻŋ āύāϤ⧁āύ āϏāĻžāϰāĻŖāĻŋ āϏāĻžāϰāĻŋ āϤ⧈āϰ⧀ āĻ•āϰ⧇āĨ¤">
+<!ENTITY instructions2.label   "āĻ•āϞāĻžāĻŽāϗ⧁āϞ⧋āϤ⧇ āύāĻŋāĻ°ā§āĻŦāĻžāϚāύ āφāϞāĻžāĻĻāĻž āĻ•āϰāϤ⧇ āĻŦā§āϝāĻŦāĻšā§ƒāϤ āĻ…āĻ•ā§āώāϰ āĻŦ⧇āϛ⧇ āύāĻŋāύ:">
+<!ENTITY commaRadio.label      "āĻ•āĻŽāĻž">
+<!ENTITY spaceRadio.label      "āĻĢāĻžāρāĻ•āĻž āĻ¸ā§āĻĨāĻžāύ">
+<!ENTITY otherRadio.label      "āĻ…āĻ¨ā§āϝāĻžāĻ¨ā§āϝ āĻ…āĻ•ā§āώāϰ:">
 <!ENTITY deleteCharCheck.label "āĻŦāĻŋāĻ­āĻžāϜāĻ• āĻ…āĻ•ā§āώāϰ āĻŽā§āϛ⧇ āĻĻā§‡ā§ŸāĻž āĻšāĻŦ⧇">
-<!ENTITY collapseSpaces.label "āĻ…āϤāĻŋāϰāĻŋāĻ•ā§āϤ āĻĢāĻžāρāĻ•āĻž āĻ¸ā§āĻĨāĻžāύ āωāĻĒ⧇āĻ•ā§āώāĻž āĻ•āϰāĻž āĻšāĻŦ⧇">
+<!ENTITY collapseSpaces.label  "āĻ…āϤāĻŋāϰāĻŋāĻ•ā§āϤ āĻĢāĻžāρāĻ•āĻž āĻ¸ā§āĻĨāĻžāύ āωāĻĒ⧇āĻ•ā§āώāĻž āĻ•āϰāĻž āĻšāĻŦ⧇">
 <!ENTITY collapseSpaces.tooltip "āύāĻŋāĻ•āϟāĻŦāĻ°ā§āϤ⧀ āĻāĻ•āĻžāϧāĻŋāĻ• āĻĢāĻžāρāĻ•āĻž āĻ¸ā§āĻĨāĻžāύāϕ⧇ āĻāĻ•āϟāĻŋ āĻŦāĻŋāĻ­āĻžāϜāϕ⧇ āĻĒāϰāĻŋāĻŖāϤ āĻ•āϰāĻž āĻšāĻŦ⧇">
--- a/editor/ui/chrome/dialogs/EdLinkChecker.dtd
+++ b/editor/ui/chrome/dialogs/EdLinkChecker.dtd
@@ -32,12 +32,12 @@
    - 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 ***** -->
 <!-- Window title -->
 
-<!ENTITY windowTitle.label "āĻ›āĻŦāĻŋ āĻāĻŦāĻ‚ āϞāĻŋāĻ‚āϕ⧇āϰ āĻ…āĻŦāĻ¸ā§āĻĨāĻžāύ āĻĒāϰ⧀āĻ•ā§āώāĻž āĻ•āϰ⧁āύ">
-<!ENTITY succeeded.label "āϏāĻĢāϞ">
-<!ENTITY failed.label "āĻŦā§āϝāĻ°ā§āĻĨ">
-<!ENTITY closeButton.label "āĻŦāĻ¨ā§āϧ āĻ•āϰ⧁āύ">
+<!ENTITY windowTitle.label     "āĻ›āĻŦāĻŋ āĻāĻŦāĻ‚ āϞāĻŋāĻ‚āϕ⧇āϰ āĻ…āĻŦāĻ¸ā§āĻĨāĻžāύ āĻĒāϰ⧀āĻ•ā§āώāĻž āĻ•āϰ⧁āύ">
+<!ENTITY succeeded.label       "āϏāĻĢāϞ">
+<!ENTITY failed.label          "āĻŦā§āϝāĻ°ā§āĻĨ">
+<!ENTITY closeButton.label     "āĻŦāĻ¨ā§āϧ āĻ•āϰ⧁āύ">
--- a/editor/ui/chrome/dialogs/EditorImageMapHotSpot.dtd
+++ b/editor/ui/chrome/dialogs/EditorImageMapHotSpot.dtd
@@ -36,23 +36,23 @@
    - the terms of any one of the MPL, the GPL or the LGPL.
    -
    - ***** END LICENSE BLOCK ***** -->
 <!-- Window title -->
 
 
 <!ENTITY windowTitle.label "āĻšāϟāĻ¸ā§āĻĒāϟ āĻŦ⧈āĻļāĻŋāĻˇā§āĻŸā§āϝ">
 
-<!ENTITY link.label "āĻšāϟāĻ¸ā§āĻĒāϟ āϞāĻŋāĻ‚āĻ•">
-<!ENTITY urlFieldset.label "āĻšāϟāĻ¸ā§āĻĒāϟ URL:">
-<!ENTITY altFieldset.label "āĻšāϟāĻ¸ā§āĻĒāϟ Alt āĻĒāĻžāĻ ā§āϝ:">
-<!ENTITY browseButton.label "āĻŦā§āϰāĻžāωāϜ...">
+<!ENTITY link.label    "āĻšāϟāĻ¸ā§āĻĒāϟ āϞāĻŋāĻ‚āĻ•">
+<!ENTITY urlFieldset.label  "āĻšāϟāĻ¸ā§āĻĒāϟ URL:">
+<!ENTITY altFieldset.label  "āĻšāϟāĻ¸ā§āĻĒāϟ Alt āĻĒāĻžāĻ ā§āϝ:">
+<!ENTITY browseButton.label  "āĻŦā§āϰāĻžāωāϜ...">
 <!ENTITY targetFieldset.label "āϞāĻ•ā§āĻˇā§āϝ āϏ⧇āϟāĻŋāĻ‚">
-<!ENTITY target.label "āĻšāϟāĻ¸ā§āĻĒāϟ āϞāĻ•ā§āĻˇā§āϝ">
+<!ENTITY target.label   "āĻšāϟāĻ¸ā§āĻĒāϟ āϞāĻ•ā§āĻˇā§āϝ">
 <!-- Targets -->
 
 <!ENTITY commonFieldset.label "āϏāĻžāϧāĻžāϰāĻŖ āϞāĻ•ā§āĻˇā§āϝ:">
-<!ENTITY none.value "(āϕ⧋āύ⧋āϟāĻŋ āύ⧟)">
-<!ENTITY same.value "āĻāĻ•āχ āĻĢā§āϰ⧇āĻŽ">
-<!ENTITY whole.value "āϏāĻŽā§āĻĒā§‚āĻ°ā§āĻŖ āĻĒ⧃āĻˇā§āĻ āĻž">
-<!ENTITY new.value "āύāϤ⧁āύ āωāχāĻ¨ā§āĻĄā§‹">
-<!ENTITY parent.value "āĻĒā§āϝāĻžāϰ⧇āĻ¨ā§āϟ āĻĢā§āϰ⧇āĻŽ">
+<!ENTITY none.value    "(āϕ⧋āύ⧋āϟāĻŋ āύ⧟)">
+<!ENTITY same.value    "āĻāĻ•āχ āĻĢā§āϰ⧇āĻŽ">
+<!ENTITY whole.value   "āϏāĻŽā§āĻĒā§‚āĻ°ā§āĻŖ āĻĒ⧃āĻˇā§āĻ āĻž">
+<!ENTITY new.value    "āύāϤ⧁āύ āωāχāĻ¨ā§āĻĄā§‹">
+<!ENTITY parent.value   "āĻĒā§āϝāĻžāϰ⧇āĻ¨ā§āϟ āĻĢā§āϰ⧇āĻŽ">
 
--- a/editor/ui/chrome/dialogs/EditorInsertTOC.dtd
+++ b/editor/ui/chrome/dialogs/EditorInsertTOC.dtd
@@ -30,20 +30,20 @@
    - use your version of this file under the terms of the MPL, indicate your
    - decision by deleting the provisions above and replace them with the notice
    - and other provisions required by the LGPL or the GPL. If you do not delete
    - the provisions above, a recipient may use your version of this file under
    - the terms of any one of the MPL, the GPL or the LGPL.
    -
    - ***** END LICENSE BLOCK ***** -->
 
-<!ENTITY Window.title "āϏ⧂āĻšā§€āĻĒāĻ¤ā§āϰ">
-<!ENTITY buildToc.label "āĻāĻ–āĻžāύ āĻĨ⧇āϕ⧇ āϏ⧂āĻšā§€āĻĒāĻ¤ā§āϰ āϤ⧈āϰāĻŋ āĻ•āϰāĻž āĻšāĻŦ⧇:">
-<!ENTITY tag.label "āĻŸā§āϝāĻžāĻ—:">
-<!ENTITY class.label "āĻ•ā§āϞāĻžāϏ:">
-<!ENTITY header1.label "āĻ¸ā§āϤāϰ ā§§">
-<!ENTITY header2.label "āĻ¸ā§āϤāϰ ⧍">
-<!ENTITY header3.label "āĻ¸ā§āϤāϰ ā§Š">
-<!ENTITY header4.label "āĻ¸ā§āϤāϰ ā§Ē">
-<!ENTITY header5.label "āĻ¸ā§āϤāϰ ā§Ģ">
-<!ENTITY header6.label "āĻ¸ā§āϤāϰ ā§Ŧ">
-<!ENTITY makeReadOnly.label "āϏ⧂āĻšā§€āĻĒāĻ¤ā§āϰāϟāĻŋ āĻļ⧁āϧ⧁āĻŽāĻžāĻ¤ā§āϰ āĻĒāĻžāĻ āϝ⧋āĻ—ā§āϝ āĻšāĻŦ⧇">
-<!ENTITY orderedList.label "āϏ⧂āĻšā§€āĻĒāĻ¤ā§āϰ⧇ āϭ⧁āĻ•ā§āϤāĻŋāϰ āϏāĻ‚āĻ–ā§āϝāĻž">
+<!ENTITY Window.title        "āϏ⧂āĻšā§€āĻĒāĻ¤ā§āϰ">
+<!ENTITY buildToc.label      "āĻāĻ–āĻžāύ āĻĨ⧇āϕ⧇ āϏ⧂āĻšā§€āĻĒāĻ¤ā§āϰ āϤ⧈āϰāĻŋ āĻ•āϰāĻž āĻšāĻŦ⧇:">
+<!ENTITY tag.label           "āĻŸā§āϝāĻžāĻ—:">
+<!ENTITY class.label         "āĻ•ā§āϞāĻžāϏ:">
+<!ENTITY header1.label       "āĻ¸ā§āϤāϰ ā§§">
+<!ENTITY header2.label       "āĻ¸ā§āϤāϰ ⧍">
+<!ENTITY header3.label       "āĻ¸ā§āϤāϰ ā§Š">
+<!ENTITY header4.label       "āĻ¸ā§āϤāϰ ā§Ē">
+<!ENTITY header5.label       "āĻ¸ā§āϤāϰ ā§Ģ">
+<!ENTITY header6.label       "āĻ¸ā§āϤāϰ ā§Ŧ">
+<!ENTITY makeReadOnly.label  "āϏ⧂āĻšā§€āĻĒāĻ¤ā§āϰāϟāĻŋ āĻļ⧁āϧ⧁āĻŽāĻžāĻ¤ā§āϰ āĻĒāĻžāĻ āϝ⧋āĻ—ā§āϝ āĻšāĻŦ⧇">
+<!ENTITY orderedList.label   "āϏ⧂āĻšā§€āĻĒāĻ¤ā§āϰ⧇ āϭ⧁āĻ•ā§āϤāĻŋāϰ āϏāĻ‚āĻ–ā§āϝāĻž">
--- a/editor/ui/chrome/dialogs/EditorPublish.dtd
+++ b/editor/ui/chrome/dialogs/EditorPublish.dtd
@@ -31,68 +31,68 @@
    - 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 ***** -->
 <!-- Window title -->
 
-<!ENTITY windowTitle.label "āĻĒ⧃āĻˇā§āĻ āĻž āĻĒā§āϰāĻ•āĻžāĻļ">
-<!ENTITY windowTitleSettings.label "āĻĒā§āϰāĻ•āĻžāĻļ⧇āϰ āϏ⧇āϟāĻŋāĻ‚">
-<!ENTITY publishTab.label "āĻĒā§āϰāĻ•āĻžāĻļ">
-<!ENTITY settingsTab.label "āϏ⧇āϟāĻŋāĻ‚">
-<!ENTITY publishButton.label "āĻĒā§āϰāĻ•āĻžāĻļ">
+<!ENTITY windowTitle.label            "āĻĒ⧃āĻˇā§āĻ āĻž āĻĒā§āϰāĻ•āĻžāĻļ">
+<!ENTITY windowTitleSettings.label    "āĻĒā§āϰāĻ•āĻžāĻļ⧇āϰ āϏ⧇āϟāĻŋāĻ‚">
+<!ENTITY publishTab.label             "āĻĒā§āϰāĻ•āĻžāĻļ">
+<!ENTITY settingsTab.label            "āϏ⧇āϟāĻŋāĻ‚">
+<!ENTITY publishButton.label          "āĻĒā§āϰāĻ•āĻžāĻļ">
 <!-- Publish Tab Panel -->
 
-<!ENTITY siteList.label "āϏāĻžāχāĻŸā§‡āϰ āύāĻžāĻŽ (e):">
-<!ENTITY siteList.accesskey "e">
-<!ENTITY siteList.tooltip "āφāĻĒāύāĻŋ āϝ⧇ āϏāĻžāχāĻŸā§‡ āĻĒā§āϰāĻ•āĻžāĻļ āĻ•āϰāϤ⧇ āϚāĻžāύ āϏ⧇āϟāĻŋ āύāĻŋāĻ°ā§āĻŦāĻžāϚāύ āĻ•āϰ⧁āύ">
-<!ENTITY newSiteButton.label "āύāϤ⧁āύ āϏāĻžāχāϟ (N)">
-<!ENTITY newSiteButton.accesskey "N">
-<!ENTITY docDirList.label "āĻāχ āĻĒāĻžāϤāĻžāϰ āϜāĻ¨ā§āϝ āϏāĻžāχāϟ āϏāĻžāĻŦāĻĄāĻŋāϰ⧇āĻ•ā§āϟāϰāĻŋ (S):">
-<!ENTITY docDirList.accesskey "S">
-<!ENTITY docDirList.tooltip "āĻāχ āĻĒāĻžāϤāĻžāϰ āϜāĻ¨ā§āϝ āĻĻā§‚āϰāĻŦāĻ°ā§āϤ⧀ āϏāĻžāĻŦāĻĄāĻŋāϰ⧇āĻ•ā§āϟāϰāĻŋāϰ āύāĻžāĻŽ āĻĻāĻŋāύ āĻŦāĻž āύāĻŋāĻ°ā§āĻŦāĻžāϚāύ āĻ•āϰ⧁āύ">
-<!ENTITY publishImgCheckbox.label "āĻ›āĻŦāĻŋ āĻāĻŦāĻ‚ āĻ…āĻ¨ā§āϝāĻžāĻ¨ā§āϝ āĻĢāĻžāχāϞ āĻ…āĻ¨ā§āϤāĻ°ā§āĻ­ā§‚āĻ•ā§āϤ āĻ•āϰāĻŖ (o)">
+<!ENTITY siteList.label               "āϏāĻžāχāĻŸā§‡āϰ āύāĻžāĻŽ (e):">
+<!ENTITY siteList.accesskey           "e">
+<!ENTITY siteList.tooltip             "āφāĻĒāύāĻŋ āϝ⧇ āϏāĻžāχāĻŸā§‡ āĻĒā§āϰāĻ•āĻžāĻļ āĻ•āϰāϤ⧇ āϚāĻžāύ āϏ⧇āϟāĻŋ āύāĻŋāĻ°ā§āĻŦāĻžāϚāύ āĻ•āϰ⧁āύ">
+<!ENTITY newSiteButton.label          "āύāϤ⧁āύ āϏāĻžāχāϟ (N)">
+<!ENTITY newSiteButton.accesskey      "N">
+<!ENTITY docDirList.label             "āĻāχ āĻĒāĻžāϤāĻžāϰ āϜāĻ¨ā§āϝ āϏāĻžāχāϟ āϏāĻžāĻŦāĻĄāĻŋāϰ⧇āĻ•ā§āϟāϰāĻŋ (S):">
+<!ENTITY docDirList.accesskey         "S">
+<!ENTITY docDirList.tooltip           "āĻāχ āĻĒāĻžāϤāĻžāϰ āϜāĻ¨ā§āϝ āĻĻā§‚āϰāĻŦāĻ°ā§āϤ⧀ āϏāĻžāĻŦāĻĄāĻŋāϰ⧇āĻ•ā§āϟāϰāĻŋāϰ āύāĻžāĻŽ āĻĻāĻŋāύ āĻŦāĻž āύāĻŋāĻ°ā§āĻŦāĻžāϚāύ āĻ•āϰ⧁āύ">
+<!ENTITY publishImgCheckbox.label     "āĻ›āĻŦāĻŋ āĻāĻŦāĻ‚ āĻ…āĻ¨ā§āϝāĻžāĻ¨ā§āϝ āĻĢāĻžāχāϞ āĻ…āĻ¨ā§āϤāĻ°ā§āĻ­ā§‚āĻ•ā§āϤ āĻ•āϰāĻŖ (o)">
 <!ENTITY publishImgCheckbox.accesskey "o">
-<!ENTITY publishImgCheckbox.tooltip "āĻāχ āĻĒ⧃āĻˇā§āĻ āĻž āĻĻā§āĻŦāĻžāϰāĻž āϰ⧇āĻĢāĻžāϰ⧇āĻ¨ā§āϏāĻ•ā§ƒāϤ āĻ›āĻŦāĻŋ āĻāĻŦāĻ‚ āĻ…āĻ¨ā§āϝāĻžāĻ¨ā§āϝ āĻĢāĻžāχāϞ āĻĒā§āϰāĻ•āĻžāĻļ āĻ•āϰāĻž āĻšāĻŦ⧇">
-<!ENTITY sameLocationRadio.label "āĻĒ⧃āĻˇā§āĻ āĻžāϰ āĻāĻ•āχ āĻ…āĻŦāĻ¸ā§āĻĨāĻžāύ āĻŦā§āϝāĻŦāĻšāĻžāϰ (U)">
-<!ENTITY sameLocationRadio.accesskey "U">
-<!ENTITY sameLocationRadio.tooltip "āĻĒ⧃āĻˇā§āĻ āĻžāϰ āĻāĻ•āχ āĻ…āĻŦāĻ¸ā§āĻĨāĻžāύ⧇ āĻĢāĻžāχāϞ āĻĒā§āϰāĻ•āĻžāĻļ āĻ•āϰ⧁āύ">
-<!ENTITY useSubdirRadio.label "āĻāχ āϏāĻžāχāϟ āϏāĻžāĻŦāĻĄāĻŋāϰ⧇āĻ•ā§āϟāϰāĻŋāϟāĻŋ āĻŦā§āϝāĻŦāĻšāĻžāϰ āĻ•āϰ⧁āύ (d):">
-<!ENTITY useSubdirRadio.accesskey "d">
-<!ENTITY useSubdirRadio.tooltip "āύāĻŋāĻ°ā§āĻŦāĻžāϚāĻŋāϤ āĻĻā§‚āϰāĻŦāĻ°ā§āϤ⧀ āϏāĻžāĻŦāĻĄāĻŋāϰ⧇āĻ•ā§āϟāϰāĻŋāϤ⧇ āĻĢāĻžāχāϞ āĻĒā§āϰāĻ•āĻžāĻļ āĻ•āϰ⧁āύ">
-<!ENTITY otherDirList.tooltip "āϝ⧇ āĻĻā§‚āϰāĻŦāĻ°ā§āϤ⧀ āϏāĻžāĻŦāĻĄāĻŋāϰ⧇āĻ•ā§āϟāϰāĻŋāϤ⧇ āĻĢāĻžāχāϞ āĻĒā§āϰāĻ•āĻžāĻļ āĻ•āϰāĻž āĻšāĻŦ⧇ āϤāĻž āύāĻŋāĻ°ā§āĻŦāĻžāϚāύ āĻ•āϰ⧁āύ āĻŦāĻž āϤāĻžāϰ āύāĻžāĻŽ āĻĻāĻŋāύ">
-<!ENTITY pageTitle.label "āĻĒ⧃āĻˇā§āĻ āĻžāϰ āĻļāĻŋāϰ⧋āύāĻžāĻŽ (T):">
-<!ENTITY pageTitle.accesskey "T">
-<!ENTITY pageTitle.tooltip "āωāχāĻ¨ā§āĻĄā§‹ āĻāĻŦāĻ‚ āĻŦ⧁āĻ•āĻŽāĻžāĻ°ā§āϕ⧇ āĻļāύāĻžāĻ•ā§āϤ āĻ•āϰāĻžāϰ āϜāĻ¨ā§āϝ āĻĒ⧃āĻˇā§āĻ āĻžāϰ āĻāĻ•āϟāĻŋ āĻļāĻŋāϰ⧋āύāĻžāĻŽ āĻĻāĻŋāύ">
-<!ENTITY pageTitleExample.label "āωāĻĻāĻžāĻšāϰāĻŖāĻ¸ā§āĻŦāϰ⧂āĻĒ: &quot;āφāĻŽāĻžāϰ āĻ“ā§Ÿā§‡āĻŦ āĻĒ⧇āϜ&quot;">
-<!ENTITY filename.label "āĻĢāĻžāχāϞ⧇āϰ āύāĻžāĻŽ (F):">
-<!ENTITY filename.accesskey "F">
-<!ENTITY filename.tooltip "āĻāĻ•āϟāĻŋ āĻ“ā§Ÿā§‡āĻŦāĻĒ⧇āĻœā§‡āϰ āϜāĻ¨ā§āϝ '.html' āϏāĻš, āĻāχ āĻĢāĻžāχāϞ⧇āϰ āϜāĻ¨ā§āϝ āĻāĻ•āϟāĻŋ āύāĻžāĻŽ āĻĻāĻŋāύ">
-<!ENTITY filenameExample.label "āωāĻĻāĻžāĻšāϰāĻŖāĻ¸ā§āĻŦāϰ⧂āĻĒ: &quot;mypage.html&quot;">
-<!ENTITY setDefaultButton.label "āĻĄāĻŋāĻĢāĻ˛ā§āϟ āĻšāĻŋāϏ⧇āĻŦ⧇ āύāĻŋāϝ⧁āĻ•ā§āϤ (D)">
-<!ENTITY setDefaultButton.accesskey "D">
-<!ENTITY removeButton.label "āϏāĻžāχāϟ āϏāϰāĻŋā§Ÿā§‡ āĻĢ⧇āϞāĻž (R)">
-<!ENTITY removeButton.accesskey "R">
+<!ENTITY publishImgCheckbox.tooltip   "āĻāχ āĻĒ⧃āĻˇā§āĻ āĻž āĻĻā§āĻŦāĻžāϰāĻž āϰ⧇āĻĢāĻžāϰ⧇āĻ¨ā§āϏāĻ•ā§ƒāϤ āĻ›āĻŦāĻŋ āĻāĻŦāĻ‚ āĻ…āĻ¨ā§āϝāĻžāĻ¨ā§āϝ āĻĢāĻžāχāϞ āĻĒā§āϰāĻ•āĻžāĻļ āĻ•āϰāĻž āĻšāĻŦ⧇">
+<!ENTITY sameLocationRadio.label      "āĻĒ⧃āĻˇā§āĻ āĻžāϰ āĻāĻ•āχ āĻ…āĻŦāĻ¸ā§āĻĨāĻžāύ āĻŦā§āϝāĻŦāĻšāĻžāϰ (U)">
+<!ENTITY sameLocationRadio.accesskey  "U">
+<!ENTITY sameLocationRadio.tooltip    "āĻĒ⧃āĻˇā§āĻ āĻžāϰ āĻāĻ•āχ āĻ…āĻŦāĻ¸ā§āĻĨāĻžāύ⧇ āĻĢāĻžāχāϞ āĻĒā§āϰāĻ•āĻžāĻļ āĻ•āϰ⧁āύ">
+<!ENTITY useSubdirRadio.label         "āĻāχ āϏāĻžāχāϟ āϏāĻžāĻŦāĻĄāĻŋāϰ⧇āĻ•ā§āϟāϰāĻŋāϟāĻŋ āĻŦā§āϝāĻŦāĻšāĻžāϰ āĻ•āϰ⧁āύ (d):">
+<!ENTITY useSubdirRadio.accesskey     "d">
+<!ENTITY useSubdirRadio.tooltip       "āύāĻŋāĻ°ā§āĻŦāĻžāϚāĻŋāϤ āĻĻā§‚āϰāĻŦāĻ°ā§āϤ⧀ āϏāĻžāĻŦāĻĄāĻŋāϰ⧇āĻ•ā§āϟāϰāĻŋāϤ⧇ āĻĢāĻžāχāϞ āĻĒā§āϰāĻ•āĻžāĻļ āĻ•āϰ⧁āύ">
+<!ENTITY otherDirList.tooltip         "āϝ⧇ āĻĻā§‚āϰāĻŦāĻ°ā§āϤ⧀ āϏāĻžāĻŦāĻĄāĻŋāϰ⧇āĻ•ā§āϟāϰāĻŋāϤ⧇ āĻĢāĻžāχāϞ āĻĒā§āϰāĻ•āĻžāĻļ āĻ•āϰāĻž āĻšāĻŦ⧇ āϤāĻž āύāĻŋāĻ°ā§āĻŦāĻžāϚāύ āĻ•āϰ⧁āύ āĻŦāĻž āϤāĻžāϰ āύāĻžāĻŽ āĻĻāĻŋāύ">
+<!ENTITY pageTitle.label              "āĻĒ⧃āĻˇā§āĻ āĻžāϰ āĻļāĻŋāϰ⧋āύāĻžāĻŽ (T):">
+<!ENTITY pageTitle.accesskey          "T">
+<!ENTITY pageTitle.tooltip            "āωāχāĻ¨ā§āĻĄā§‹ āĻāĻŦāĻ‚ āĻŦ⧁āĻ•āĻŽāĻžāĻ°ā§āϕ⧇ āĻļāύāĻžāĻ•ā§āϤ āĻ•āϰāĻžāϰ āϜāĻ¨ā§āϝ āĻĒ⧃āĻˇā§āĻ āĻžāϰ āĻāĻ•āϟāĻŋ āĻļāĻŋāϰ⧋āύāĻžāĻŽ āĻĻāĻŋāύ">
+<!ENTITY pageTitleExample.label       "āωāĻĻāĻžāĻšāϰāĻŖāĻ¸ā§āĻŦāϰ⧂āĻĒ: &quot;āφāĻŽāĻžāϰ āĻ“ā§Ÿā§‡āĻŦ āĻĒ⧇āϜ&quot;">
+<!ENTITY filename.label               "āĻĢāĻžāχāϞ⧇āϰ āύāĻžāĻŽ (F):">
+<!ENTITY filename.accesskey           "F">
+<!ENTITY filename.tooltip             "āĻāĻ•āϟāĻŋ āĻ“ā§Ÿā§‡āĻŦāĻĒ⧇āĻœā§‡āϰ āϜāĻ¨ā§āϝ '.html' āϏāĻš, āĻāχ āĻĢāĻžāχāϞ⧇āϰ āϜāĻ¨ā§āϝ āĻāĻ•āϟāĻŋ āύāĻžāĻŽ āĻĻāĻŋāύ">
+<!ENTITY filenameExample.label        "āωāĻĻāĻžāĻšāϰāĻŖāĻ¸ā§āĻŦāϰ⧂āĻĒ: &quot;mypage.html&quot;">
+<!ENTITY setDefaultButton.label       "āĻĄāĻŋāĻĢāĻ˛ā§āϟ āĻšāĻŋāϏ⧇āĻŦ⧇ āύāĻŋāϝ⧁āĻ•ā§āϤ (D)">
+<!ENTITY setDefaultButton.accesskey   "D">
+<!ENTITY removeButton.label           "āϏāĻžāχāϟ āϏāϰāĻŋā§Ÿā§‡ āĻĢ⧇āϞāĻž (R)">
+<!ENTITY removeButton.accesskey       "R">
 <!-- Settings Tab Panel -->
 
-<!ENTITY publishSites.label "āϏāĻžāχāϟ āĻĒā§āϰāĻ•āĻžāĻļ āĻ•āϰāĻž āĻšāĻšā§āϛ⧇">
-<!ENTITY serverInfo.label "āϏāĻžāĻ°ā§āĻ­āĻžāϰ⧇āϰ āϤāĻĨā§āϝ">
-<!ENTITY loginInfo.label "āϞāĻ—āχāύ āϤāĻĨā§āϝ">
-<!ENTITY siteName.label "āϏāĻžāχāĻŸā§‡āϰ āύāĻžāĻŽ (e):">
-<!ENTITY siteName.accesskey "e">
-<!ENTITY siteName.tooltip "āĻāĻ•āϟāĻŋ āĻĄāĻžāĻ•āύāĻžāĻŽ, āϝāĻž āĻāχ āĻĒā§āϰāĻ•āĻžāĻļ āĻ•āϰāĻžāϰ āϏāĻžāχāϟāϕ⧇ āĻļāύāĻžāĻ•ā§āϤ āĻ•āϰ⧇ (āωāĻĻāĻžāĻšāϰāĻŖāĻ¸ā§āĻŦāϰ⧂āĻĒ: 'MySite')">
-<!ENTITY siteUrl.label "āĻ āĻŋāĻ•āĻžāύāĻž āĻĒā§āϰāĻ•āĻžāĻļ (āωāĻĻāĻžāĻšāϰāĻŖāĻ¸ā§āĻŦāϰ⧂āĻĒ: 'ftp://ftp.myisp.com/myusername') (a):">
-<!ENTITY siteUrl.accesskey "a">
-<!ENTITY siteUrl.tooltip "āφāĻĒāύāĻžāϰ āχāĻ¨ā§āϟāĻžāϰāύ⧇āϟ āϏ⧇āĻŦāĻžāĻĻāĻžāϤāĻž āĻŦāĻž āĻ“ā§Ÿā§‡āĻŦ āĻšā§‹āĻ¸ā§āϟāĻŋāĻ‚ āϏ⧇āĻŦāĻž āĻĻā§āĻŦāĻžāϰāĻž āĻĒā§āϰāĻĻāĻ¤ā§āϤ FTP:// āĻŦāĻž HTTP:// āĻ āĻŋāĻ•āĻžāύāĻž">
-<!ENTITY browseUrl.label "āφāĻĒāύāĻžāϰ āĻšā§‹āĻŽāĻĒ⧇āĻœā§‡āϰ HTTP āĻ āĻŋāĻ•āĻžāύāĻž (āωāĻĻāĻžāĻšāϰāĻŖāĻ¸ā§āĻŦāϰ⧂āĻĒ: 'http://www.myisp.com/myusername'): (T)">
-<!ENTITY browseUrl.accesskey "T">
-<!ENTITY browseUrl.tooltip "āφāĻĒāύāĻžāϰ āĻšā§‹āĻŽ āĻĄāĻŋāϰ⧇āĻ•ā§āϟāϰāĻŋāϰ HTTP:// āĻ āĻŋāĻ•āĻžāύāĻž (āĻĢāĻžāχāϞ⧇āϰ āύāĻžāĻŽ āĻ…āĻ¨ā§āϤāĻ°ā§āĻ­ā§‚āĻ•ā§āϤ āĻ•āϰāĻž āĻšāĻŦ⧇ āύāĻž)">
-<!ENTITY username.label "āĻŦā§āϝāĻŦāĻšāĻžāϰāĻ•āĻžāϰ⧀ āύāĻžāĻŽ (U):">
-<!ENTITY username.accesskey "U">
-<!ENTITY username.tooltip "āχāĻ¨ā§āϟāĻžāϰāύ⧇āϟ āϏ⧇āĻŦāĻžāĻĻāĻžāϤāĻž āĻŦāĻž āĻ“ā§Ÿā§‡āĻŦ āĻšā§‹āĻ¸ā§āϟāĻŋāĻ‚ āϏ⧇āĻŦāĻžāϤ⧇ āϞāĻ—āχāύ āĻ•āϰāϤ⧇, āφāĻĒāύāĻžāϰ āĻŦā§āϝāĻŦāĻšā§ƒāϤ āĻŦā§āϝāĻŦāĻšāĻžāϰāĻ•āĻžāϰ⧀ āύāĻžāĻŽ">
-<!ENTITY password.label "āĻĒāĻžāϏāĻ“ā§ŸāĻžāĻ°ā§āĻĄ (w):">
-<!ENTITY password.accesskey "w">
-<!ENTITY password.tooltip "āφāĻĒāύāĻžāϰ āĻŦā§āϝāĻŦāĻšāĻžāϰāĻ•āĻžāϰ⧀ āύāĻžāĻŽā§‡āϰ āϏāĻžāĻĨ⧇ āϏāĻ‚āĻļā§āϞāĻŋāĻˇā§āϟ āĻĒāĻžāϏāĻ“ā§ŸāĻžāĻ°ā§āĻĄ">
-<!ENTITY savePassword.label "āĻĒāĻžāϏāĻ“ā§ŸāĻžāĻ°ā§āĻĄ āϏāĻ‚āϰāĻ•ā§āώāĻŖ āĻ•āϰ⧁āύ (S)">
-<!ENTITY savePassword.accesskey "S">
-<!ENTITY savePassword.tooltip "āĻĒāĻžāϏāĻ“ā§ŸāĻžāĻ°ā§āĻĄ āĻŦā§āϝāĻŦāĻ¸ā§āĻĨāĻžāĻĒāĻ• āĻŦā§āϝāĻŦāĻšāĻžāϰ āĻ•āϰ⧇ āφāĻĒāύāĻžāϰ āĻĒāĻžāϏāĻ“ā§ŸāĻžāĻ°ā§āĻĄ āύāĻŋāϰāĻžāĻĒāĻĻāĻ­āĻžāĻŦ⧇ āϏāĻ‚āϰāĻ•ā§āώāĻŖ āĻ•āϰāϤ⧇ āĻāϟāĻŋ āύāĻŋāĻ°ā§āĻŦāĻžāϚāύ āĻ•āϰ⧁āύ">
+<!ENTITY publishSites.label           "āϏāĻžāχāϟ āĻĒā§āϰāĻ•āĻžāĻļ āĻ•āϰāĻž āĻšāĻšā§āϛ⧇">
+<!ENTITY serverInfo.label             "āϏāĻžāĻ°ā§āĻ­āĻžāϰ⧇āϰ āϤāĻĨā§āϝ">
+<!ENTITY loginInfo.label              "āϞāĻ—āχāύ āϤāĻĨā§āϝ">
+<!ENTITY siteName.label               "āϏāĻžāχāĻŸā§‡āϰ āύāĻžāĻŽ (e):">
+<!ENTITY siteName.accesskey           "e">
+<!ENTITY siteName.tooltip             "āĻāĻ•āϟāĻŋ āĻĄāĻžāĻ•āύāĻžāĻŽ, āϝāĻž āĻāχ āĻĒā§āϰāĻ•āĻžāĻļ āĻ•āϰāĻžāϰ āϏāĻžāχāϟāϕ⧇ āĻļāύāĻžāĻ•ā§āϤ āĻ•āϰ⧇ (āωāĻĻāĻžāĻšāϰāĻŖāĻ¸ā§āĻŦāϰ⧂āĻĒ: 'MySite')">
+<!ENTITY siteUrl.label                "āĻ āĻŋāĻ•āĻžāύāĻž āĻĒā§āϰāĻ•āĻžāĻļ (āωāĻĻāĻžāĻšāϰāĻŖāĻ¸ā§āĻŦāϰ⧂āĻĒ: 'ftp://ftp.myisp.com/myusername') (a):">
+<!ENTITY siteUrl.accesskey            "a">
+<!ENTITY siteUrl.tooltip              "āφāĻĒāύāĻžāϰ āχāĻ¨ā§āϟāĻžāϰāύ⧇āϟ āϏ⧇āĻŦāĻžāĻĻāĻžāϤāĻž āĻŦāĻž āĻ“ā§Ÿā§‡āĻŦ āĻšā§‹āĻ¸ā§āϟāĻŋāĻ‚ āϏ⧇āĻŦāĻž āĻĻā§āĻŦāĻžāϰāĻž āĻĒā§āϰāĻĻāĻ¤ā§āϤ FTP:// āĻŦāĻž HTTP:// āĻ āĻŋāĻ•āĻžāύāĻž">
+<!ENTITY browseUrl.label              "āφāĻĒāύāĻžāϰ āĻšā§‹āĻŽāĻĒ⧇āĻœā§‡āϰ HTTP āĻ āĻŋāĻ•āĻžāύāĻž (āωāĻĻāĻžāĻšāϰāĻŖāĻ¸ā§āĻŦāϰ⧂āĻĒ: 'http://www.myisp.com/myusername'): (T)">
+<!ENTITY browseUrl.accesskey          "T">
+<!ENTITY browseUrl.tooltip            "āφāĻĒāύāĻžāϰ āĻšā§‹āĻŽ āĻĄāĻŋāϰ⧇āĻ•ā§āϟāϰāĻŋāϰ HTTP:// āĻ āĻŋāĻ•āĻžāύāĻž (āĻĢāĻžāχāϞ⧇āϰ āύāĻžāĻŽ āĻ…āĻ¨ā§āϤāĻ°ā§āĻ­ā§‚āĻ•ā§āϤ āĻ•āϰāĻž āĻšāĻŦ⧇ āύāĻž)">
+<!ENTITY username.label               "āĻŦā§āϝāĻŦāĻšāĻžāϰāĻ•āĻžāϰ⧀ āύāĻžāĻŽ (U):">
+<!ENTITY username.accesskey           "U">
+<!ENTITY username.tooltip             "āχāĻ¨ā§āϟāĻžāϰāύ⧇āϟ āϏ⧇āĻŦāĻžāĻĻāĻžāϤāĻž āĻŦāĻž āĻ“ā§Ÿā§‡āĻŦ āĻšā§‹āĻ¸ā§āϟāĻŋāĻ‚ āϏ⧇āĻŦāĻžāϤ⧇ āϞāĻ—āχāύ āĻ•āϰāϤ⧇, āφāĻĒāύāĻžāϰ āĻŦā§āϝāĻŦāĻšā§ƒāϤ āĻŦā§āϝāĻŦāĻšāĻžāϰāĻ•āĻžāϰ⧀ āύāĻžāĻŽ">
+<!ENTITY password.label               "āĻĒāĻžāϏāĻ“ā§ŸāĻžāĻ°ā§āĻĄ (w):">
+<!ENTITY password.accesskey           "w">
+<!ENTITY password.tooltip             "āφāĻĒāύāĻžāϰ āĻŦā§āϝāĻŦāĻšāĻžāϰāĻ•āĻžāϰ⧀ āύāĻžāĻŽā§‡āϰ āϏāĻžāĻĨ⧇ āϏāĻ‚āĻļā§āϞāĻŋāĻˇā§āϟ āĻĒāĻžāϏāĻ“ā§ŸāĻžāĻ°ā§āĻĄ">
+<!ENTITY savePassword.label           "āĻĒāĻžāϏāĻ“ā§ŸāĻžāĻ°ā§āĻĄ āϏāĻ‚āϰāĻ•ā§āώāĻŖ āĻ•āϰ⧁āύ (S)">
+<!ENTITY savePassword.accesskey       "S">
+<!ENTITY savePassword.tooltip         "āĻĒāĻžāϏāĻ“ā§ŸāĻžāĻ°ā§āĻĄ āĻŦā§āϝāĻŦāĻ¸ā§āĻĨāĻžāĻĒāĻ• āĻŦā§āϝāĻŦāĻšāĻžāϰ āĻ•āϰ⧇ āφāĻĒāύāĻžāϰ āĻĒāĻžāϏāĻ“ā§ŸāĻžāĻ°ā§āĻĄ āύāĻŋāϰāĻžāĻĒāĻĻāĻ­āĻžāĻŦ⧇ āϏāĻ‚āϰāĻ•ā§āώāĻŖ āĻ•āϰāϤ⧇ āĻāϟāĻŋ āύāĻŋāĻ°ā§āĻŦāĻžāϚāύ āĻ•āϰ⧁āύ">
--- a/editor/ui/chrome/dialogs/EditorPublishProgress.dtd
+++ b/editor/ui/chrome/dialogs/EditorPublishProgress.dtd
@@ -32,19 +32,19 @@
    - 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 ***** -->
 <!-- Window title -->
 
-<!ENTITY siteUrl.label "āϏāĻžāχāϟ URL:">
-<!ENTITY docSubdir.label "āĻĒ⧃āĻˇā§āĻ āĻžāϰ āϏāĻžāĻŦāĻĄāĻŋāϰ⧇āĻ•ā§āϟāϰāĻŋ:">
-<!ENTITY otherSubdir.label "āĻ›āĻŦāĻŋāϰ āϏāĻžāĻŦāĻĄāĻŋāϰ⧇āĻ•ā§āϟāϰāĻŋ:">
+<!ENTITY siteUrl.label         "āϏāĻžāχāϟ URL:">
+<!ENTITY docSubdir.label       "āĻĒ⧃āĻˇā§āĻ āĻžāϰ āϏāĻžāĻŦāĻĄāĻŋāϰ⧇āĻ•ā§āϟāϰāĻŋ:">
+<!ENTITY otherSubdir.label     "āĻ›āĻŦāĻŋāϰ āϏāĻžāĻŦāĻĄāĻŋāϰ⧇āĻ•ā§āϟāϰāĻŋ:">
 
-<!ENTITY status.label "āĻĒā§āϰāĻ•āĻžāĻļ āĻ•āϰāĻž āĻšāĻšā§āϛ⧇...">
-<!ENTITY fileList.label "āĻĒā§āϰāĻ•āĻžāĻļ⧇āϰ āĻ…āĻŦāĻ¸ā§āĻĨāĻž">
-<!ENTITY succeeded.label "āϏāĻĢāϞ">
-<!ENTITY failed.label "āĻŦā§āϝāĻ°ā§āĻĨ">
+<!ENTITY status.label          "āĻĒā§āϰāĻ•āĻžāĻļ āĻ•āϰāĻž āĻšāĻšā§āϛ⧇...">
+<!ENTITY fileList.label        "āĻĒā§āϰāĻ•āĻžāĻļ⧇āϰ āĻ…āĻŦāĻ¸ā§āĻĨāĻž">
+<!ENTITY succeeded.label       "āϏāĻĢāϞ">
+<!ENTITY failed.label          "āĻŦā§āϝāĻ°ā§āĻĨ">
 
-<!ENTITY keepOpen "āĻĒā§āϰāĻ•āĻžāĻļ āϏāĻŽā§āĻĒāĻ¨ā§āύ āĻšāĻ“ā§ŸāĻžāϰ āĻĒāϰ āĻāχ āωāχāĻ¨ā§āĻĄā§‹āϟāĻŋ āĻ–ā§‹āϞāĻž āϰāĻžāĻ–āĻž āĻšāĻŦ⧇āĨ¤">
-<!ENTITY closeButton.label "āĻŦāĻ¨ā§āϧ āĻ•āϰ⧁āύ">
+<!ENTITY keepOpen              "āĻĒā§āϰāĻ•āĻžāĻļ āϏāĻŽā§āĻĒāĻ¨ā§āύ āĻšāĻ“ā§ŸāĻžāϰ āĻĒāϰ āĻāχ āωāχāĻ¨ā§āĻĄā§‹āϟāĻŋ āĻ–ā§‹āϞāĻž āϰāĻžāĻ–āĻž āĻšāĻŦ⧇āĨ¤">
+<!ENTITY closeButton.label     "āĻŦāĻ¨ā§āϧ āĻ•āϰ⧁āύ">
--- a/editor/ui/chrome/dialogs/EditorTableProperties.dtd
+++ b/editor/ui/chrome/dialogs/EditorTableProperties.dtd
@@ -30,79 +30,79 @@
    - use your version of this file under the terms of the MPL, indicate your
    - decision by deleting the provisions above and replace them with the notice
    - and other provisions required by the GPL or the LGPL. If you do not delete
    - the provisions above, a recipient may use your version of this file under
    - the terms of any one of the MPL, the GPL or the LGPL.
    -
    - ***** END LICENSE BLOCK ***** -->
 
-<!ENTITY tableWindow.title "āϏāĻžāϰāĻŖāĻŋāϰ āĻŦ⧈āĻļāĻŋāĻˇā§āĻŸā§āϝ">
-<!ENTITY applyButton.label "āĻĒā§āĻ°ā§Ÿā§‹āĻ— (A)">
-<!ENTITY applyButton.accesskey "A">
-<!ENTITY closeButton.label "āĻŦāĻ¨ā§āϧ āĻ•āϰ⧁āύ">
-<!ENTITY tableTab.label "āϏāĻžāϰāĻŖāĻŋ">
-<!ENTITY cellTab.label "āϘāϰ">
-<!ENTITY tableRows.label "āϏāĻžāϰāĻŋ (R):">
-<!ENTITY tableRows.accessKey "R">
-<!ENTITY tableColumns.label "āĻ•āϞāĻžāĻŽ (C):">
-<!ENTITY tableColumns.accessKey "C">
-<!ENTITY tableHeight.label "āωāĻšā§āϚāϤāĻž (g):">
-<!ENTITY tableHeight.accessKey "g">
-<!ENTITY tableWidth.label "āĻĒā§āϰāĻ¸ā§āĻĨ (W):">
-<!ENTITY tableWidth.accessKey "W">
-<!ENTITY tableBorderSpacing.label "āϏ⧀āĻŽāĻžāύāĻž āĻāĻŦāĻ‚ āĻĢāĻžāρāĻ•āĻž āϜāĻžā§ŸāĻ—āĻž">
-<!ENTITY tableBorderWidth.label "āϏ⧀āĻŽāĻžāύāĻž (B):">
-<!ENTITY tableBorderWidth.accessKey "B">
-<!ENTITY tableSpacing.label "āĻĢāĻžāρāĻ•āĻž āϜāĻžā§ŸāĻ—āĻž (S):">
-<!ENTITY tableSpacing.accessKey "S">
-<!ENTITY tablePadding.label "āĻĒā§āϝāĻžāĻĄāĻŋāĻ‚ (P):">
-<!ENTITY tablePadding.accessKey "P">
-<!ENTITY tablePxBetwCells.label "āϘāϰ⧇āϰ āĻŽāĻ§ā§āϝāĻŦāĻ°ā§āϤ⧀ āĻĒāĻŋāĻ•ā§āϏ⧇āϞ">
+<!ENTITY tableWindow.title                "āϏāĻžāϰāĻŖāĻŋāϰ āĻŦ⧈āĻļāĻŋāĻˇā§āĻŸā§āϝ">
+<!ENTITY applyButton.label                "āĻĒā§āĻ°ā§Ÿā§‹āĻ— (A)">
+<!ENTITY applyButton.accesskey            "A">
+<!ENTITY closeButton.label                "āĻŦāĻ¨ā§āϧ āĻ•āϰ⧁āύ">
+<!ENTITY tableTab.label                   "āϏāĻžāϰāĻŖāĻŋ">
+<!ENTITY cellTab.label                    "āϘāϰ">
+<!ENTITY tableRows.label                  "āϏāĻžāϰāĻŋ (R):">
+<!ENTITY tableRows.accessKey              "R">
+<!ENTITY tableColumns.label               "āĻ•āϞāĻžāĻŽ (C):">
+<!ENTITY tableColumns.accessKey           "C">
+<!ENTITY tableHeight.label                "āωāĻšā§āϚāϤāĻž (g):">
+<!ENTITY tableHeight.accessKey            "g">
+<!ENTITY tableWidth.label                 "āĻĒā§āϰāĻ¸ā§āĻĨ (W):">
+<!ENTITY tableWidth.accessKey             "W">
+<!ENTITY tableBorderSpacing.label         "āϏ⧀āĻŽāĻžāύāĻž āĻāĻŦāĻ‚ āĻĢāĻžāρāĻ•āĻž āϜāĻžā§ŸāĻ—āĻž">
+<!ENTITY tableBorderWidth.label           "āϏ⧀āĻŽāĻžāύāĻž (B):">
+<!ENTITY tableBorderWidth.accessKey       "B">
+<!ENTITY tableSpacing.label               "āĻĢāĻžāρāĻ•āĻž āϜāĻžā§ŸāĻ—āĻž (S):">
+<!ENTITY tableSpacing.accessKey           "S">
+<!ENTITY tablePadding.label               "āĻĒā§āϝāĻžāĻĄāĻŋāĻ‚ (P):">
+<!ENTITY tablePadding.accessKey           "P">
+<!ENTITY tablePxBetwCells.label           "āϘāϰ⧇āϰ āĻŽāĻ§ā§āϝāĻŦāĻ°ā§āϤ⧀ āĻĒāĻŋāĻ•ā§āϏ⧇āϞ">
 <!ENTITY tablePxBetwBrdrCellContent.label "āϘāϰ⧇āϰ āϏ⧀āĻŽāĻžāύāĻž āĻāĻŦāĻ‚ āĻŦāĻŋāώ⧟āĻŦāĻ¸ā§āϤ⧁āϰ āĻŽāĻ§ā§āϝāĻŦāĻ°ā§āϤ⧀ āĻĒāĻŋāĻ•ā§āϏ⧇āϞ">
-<!ENTITY tableAlignment.label "āϏāĻžāϰāĻŖāĻŋ āϏāĻžāϜāĻžāύ⧋ (T):">
-<!ENTITY tableAlignment.accessKey "T">
-<!ENTITY tableCaption.label "āĻ•ā§āϝāĻžāĻĒāĻļāύ (n):">
-<!ENTITY tableCaption.accessKey "n">
-<!ENTITY tableCaptionAbove.label "āϏāĻžāϰāĻŖāĻŋāϰ ‌āωāĻĒāϰ⧇">
-<!ENTITY tableCaptionBelow.label "āϏāĻžāϰāĻŖāĻŋāϰ āύāĻŋāĻšā§‡">
-<!ENTITY tableCaptionLeft.label "āϏāĻžāϰāĻŖāĻŋāϰ āĻŦāĻžāĻŽā§‡">
-<!ENTITY tableCaptionRight.label "āϏāĻžāϰāĻŖāĻŋāϰ āĻĄāĻžāύ⧇">
-<!ENTITY tableCaptionNone.label "āϕ⧋āύ⧋āϟāĻŋ āύ⧟">
-<!ENTITY tableInheritColor.label "(āĻŦāĻŋāώ⧟āĻŦāĻ¸ā§āϤ⧁ āϭ⧇āĻĻ āĻ•āϰ⧇ āĻĒ⧃āĻˇā§āĻ āĻžāϰ āϰāĻ‚ āĻĻ⧇āĻ–āĻžāύ⧋ āĻšāĻŦ⧇)">
+<!ENTITY tableAlignment.label             "āϏāĻžāϰāĻŖāĻŋ āϏāĻžāϜāĻžāύ⧋ (T):">
+<!ENTITY tableAlignment.accessKey         "T">
+<!ENTITY tableCaption.label               "āĻ•ā§āϝāĻžāĻĒāĻļāύ (n):">
+<!ENTITY tableCaption.accessKey           "n">
+<!ENTITY tableCaptionAbove.label          "āϏāĻžāϰāĻŖāĻŋāϰ ‌āωāĻĒāϰ⧇">
+<!ENTITY tableCaptionBelow.label          "āϏāĻžāϰāĻŖāĻŋāϰ āύāĻŋāĻšā§‡">
+<!ENTITY tableCaptionLeft.label           "āϏāĻžāϰāĻŖāĻŋāϰ āĻŦāĻžāĻŽā§‡">
+<!ENTITY tableCaptionRight.label          "āϏāĻžāϰāĻŖāĻŋāϰ āĻĄāĻžāύ⧇">
+<!ENTITY tableCaptionNone.label           "āϕ⧋āύ⧋āϟāĻŋ āύ⧟">
+<!ENTITY tableInheritColor.label           "(āĻŦāĻŋāώ⧟āĻŦāĻ¸ā§āϤ⧁ āϭ⧇āĻĻ āĻ•āϰ⧇ āĻĒ⧃āĻˇā§āĻ āĻžāϰ āϰāĻ‚ āĻĻ⧇āĻ–āĻžāύ⧋ āĻšāĻŦ⧇)">
 
-<!ENTITY cellSelection.label "āύāĻŋāĻ°ā§āĻŦāĻžāϚāύ">
-<!ENTITY cellSelectCell.label "āϘāϰ">
-<!ENTITY cellSelectRow.label "āϏāĻžāϰāĻŋ">
-<!ENTITY cellSelectColumn.label "āĻ•āϞāĻžāĻŽ">
-<!ENTITY cellSelectNext.label "āĻĒāϰāĻŦāĻ°ā§āϤ⧀ (N)">
-<!ENTITY cellSelectNext.accessKey "N">
-<!ENTITY cellSelectPrevious.label "āĻĒā§‚āĻ°ā§āĻŦāĻŦāĻ°ā§āϤ⧀ (P)">
-<!ENTITY cellSelectPrevious.accessKey "P">
-<!ENTITY applyBeforeChange.label "āύāĻŋāĻ°ā§āĻŦāĻžāϚāĻŋāϤ āĻ…āĻ‚āĻļ āĻĒāϰāĻŋāĻŦāĻ°ā§āϤāύ āĻ•āϰāĻžāϰ āĻĒā§‚āĻ°ā§āĻŦ⧇ āĻŦāĻ°ā§āϤāĻŽāĻžāύ āĻĒāϰāĻŋāĻŦāĻ°ā§āϤāύ āĻ•āĻžāĻ°ā§āϝāĻ•āϰ āĻ•āϰāĻž āĻšāĻŦ⧇āĨ¤">
-<!ENTITY cellContentAlignment.label "āĻŦāĻŋāώ⧟āĻŦāĻ¸ā§āϤ⧁ āϏāĻžāϜāĻžāύ⧋">
-<!ENTITY cellHorizontal.label "āĻ…āύ⧁āĻ­ā§‚āĻŽāĻŋāĻ• (z):">
-<!ENTITY cellHorizontal.accessKey "z">
-<!ENTITY cellVertical.label "āωāĻ˛ā§āϞāĻŽā§āĻŦ (V):">
-<!ENTITY cellVertical.accessKey "V">
-<!ENTITY cellStyle.label "āϘāϰ⧇āϰ āĻļ⧈āϞ⧀ (C):">
-<!ENTITY cellStyle.accessKey "C">
-<!ENTITY cellNormal.label "āϏāĻžāϧāĻžāϰāĻŖ">
-<!ENTITY cellHeader.label "āĻļā§€āĻ°ā§āώāϚāϰāĻŖ">
-<!ENTITY cellTextWrap.label "āĻĒāĻžāĻ ā§āϝ āĻŽā§‹ā§œāĻžāύ⧋ (T):">
-<!ENTITY cellTextWrap.accessKey "T">
-<!ENTITY cellWrap.label "āĻŽā§‹ā§œāĻžāύ⧋">
-<!ENTITY cellNoWrap.label "āĻŽā§‹ā§œāĻžāύ⧋ āĻšāĻŦ⧇ āύāĻž">
-<!ENTITY cellAlignTop.label "āĻļā§€āĻ°ā§āώ⧇">
-<!ENTITY cellAlignMiddle.label "āĻŽāĻ§ā§āϝ⧇">
-<!ENTITY cellAlignBottom.label "āύāĻŋāĻšā§‡">
-<!ENTITY cellAlignJustify.label "āωāϭ⧟āĻĒā§āϰāĻžāĻ¨ā§āϤāĻŋāĻ•">
-<!ENTITY cellInheritColor.label "(āĻŦāĻŋāώ⧟āĻŦāĻ¸ā§āϤ⧁ āϭ⧇āĻĻ āĻ•āϰ⧇ āϏāĻžāϰāĻŖāĻŋāϰ āϰāĻ‚ āĻĻ⧇āĻ–āĻžāύ⧋ āĻšāĻŦ⧇)">
-<!ENTITY cellUseCheckboxHelp.label "āϏāĻŦ āύāĻŋāĻ°ā§āĻŦāĻžāϚāĻŋāϤ āϘāϰ⧇, āϕ⧋āύ āĻŦ⧈āĻļāĻŋāĻˇā§āĻŸā§āϝ āĻĒā§āĻ°ā§Ÿā§‹āĻ— āĻ•āϰāĻž āĻšāĻŦ⧇ āϤāĻž āύāĻŋāĻ°ā§āϧāĻžāϰāĻŖ āĻ•āϰāĻžāϰ āϜāĻ¨ā§āϝ āĻšā§‡āĻ• āĻŦāĻžāĻ•ā§āϏ āĻŦā§āϝāĻŦāĻšāĻžāϰ āĻ•āϰ⧁āύ">
+<!ENTITY cellSelection.label              "āύāĻŋāĻ°ā§āĻŦāĻžāϚāύ">
+<!ENTITY cellSelectCell.label             "āϘāϰ">
+<!ENTITY cellSelectRow.label              "āϏāĻžāϰāĻŋ">
+<!ENTITY cellSelectColumn.label           "āĻ•āϞāĻžāĻŽ">
+<!ENTITY cellSelectNext.label             "āĻĒāϰāĻŦāĻ°ā§āϤ⧀ (N)">
+<!ENTITY cellSelectNext.accessKey         "N">
+<!ENTITY cellSelectPrevious.label         "āĻĒā§‚āĻ°ā§āĻŦāĻŦāĻ°ā§āϤ⧀ (P)">
+<!ENTITY cellSelectPrevious.accessKey     "P">
+<!ENTITY applyBeforeChange.label          "āύāĻŋāĻ°ā§āĻŦāĻžāϚāĻŋāϤ āĻ…āĻ‚āĻļ āĻĒāϰāĻŋāĻŦāĻ°ā§āϤāύ āĻ•āϰāĻžāϰ āĻĒā§‚āĻ°ā§āĻŦ⧇ āĻŦāĻ°ā§āϤāĻŽāĻžāύ āĻĒāϰāĻŋāĻŦāĻ°ā§āϤāύ āĻ•āĻžāĻ°ā§āϝāĻ•āϰ āĻ•āϰāĻž āĻšāĻŦ⧇āĨ¤">
+<!ENTITY cellContentAlignment.label       "āĻŦāĻŋāώ⧟āĻŦāĻ¸ā§āϤ⧁ āϏāĻžāϜāĻžāύ⧋">
+<!ENTITY cellHorizontal.label             "āĻ…āύ⧁āĻ­ā§‚āĻŽāĻŋāĻ• (z):">
+<!ENTITY cellHorizontal.accessKey         "z">
+<!ENTITY cellVertical.label               "āωāĻ˛ā§āϞāĻŽā§āĻŦ (V):">
+<!ENTITY cellVertical.accessKey           "V">
+<!ENTITY cellStyle.label                  "āϘāϰ⧇āϰ āĻļ⧈āϞ⧀ (C):">
+<!ENTITY cellStyle.accessKey              "C">
+<!ENTITY cellNormal.label                 "āϏāĻžāϧāĻžāϰāĻŖ">
+<!ENTITY cellHeader.label                 "āĻļā§€āĻ°ā§āώāϚāϰāĻŖ">
+<!ENTITY cellTextWrap.label               "āĻĒāĻžāĻ ā§āϝ āĻŽā§‹ā§œāĻžāύ⧋ (T):">
+<!ENTITY cellTextWrap.accessKey           "T">
+<!ENTITY cellWrap.label                   "āĻŽā§‹ā§œāĻžāύ⧋">
+<!ENTITY cellNoWrap.label                 "āĻŽā§‹ā§œāĻžāύ⧋ āĻšāĻŦ⧇ āύāĻž">
+<!ENTITY cellAlignTop.label               "āĻļā§€āĻ°ā§āώ⧇">
+<!ENTITY cellAlignMiddle.label            "āĻŽāĻ§ā§āϝ⧇">
+<!ENTITY cellAlignBottom.label            "āύāĻŋāĻšā§‡">
+<!ENTITY cellAlignJustify.label           "āωāϭ⧟āĻĒā§āϰāĻžāĻ¨ā§āϤāĻŋāĻ•">
+<!ENTITY cellInheritColor.label           "(āĻŦāĻŋāώ⧟āĻŦāĻ¸ā§āϤ⧁ āϭ⧇āĻĻ āĻ•āϰ⧇ āϏāĻžāϰāĻŖāĻŋāϰ āϰāĻ‚ āĻĻ⧇āĻ–āĻžāύ⧋ āĻšāĻŦ⧇)">
+<!ENTITY cellUseCheckboxHelp.label        "āϏāĻŦ āύāĻŋāĻ°ā§āĻŦāĻžāϚāĻŋāϤ āϘāϰ⧇, āϕ⧋āύ āĻŦ⧈āĻļāĻŋāĻˇā§āĻŸā§āϝ āĻĒā§āĻ°ā§Ÿā§‹āĻ— āĻ•āϰāĻž āĻšāĻŦ⧇ āϤāĻž āύāĻŋāĻ°ā§āϧāĻžāϰāĻŖ āĻ•āϰāĻžāϰ āϜāĻ¨ā§āϝ āĻšā§‡āĻ• āĻŦāĻžāĻ•ā§āϏ āĻŦā§āϝāĻŦāĻšāĻžāϰ āĻ•āϰ⧁āύ">
 <!-- Used in both Table and Cell panels  -->
 
-<!ENTITY size.label "āφāĻ•āĻžāϰ">
-<!ENTITY pixels.label "āĻĒāĻŋāĻ•ā§āϏ⧇āϞ">
-<!ENTITY backgroundColor.label "āĻĒāϟāĻ­ā§‚āĻŽāĻŋāϰ āϰāĻ‚ (B):">
-<!ENTITY backgroundColor.accessKey "B">
-<!ENTITY AlignLeft.label "āĻŦāĻžāĻŽ">
-<!ENTITY AlignCenter.label "āϕ⧇āĻ¨ā§āĻĻā§āϰ">
-<!ENTITY AlignRight.label "āĻĄāĻžāύ">
+<!ENTITY size.label                       "āφāĻ•āĻžāϰ">
+<!ENTITY pixels.label                     "āĻĒāĻŋāĻ•ā§āϏ⧇āϞ">
+<!ENTITY backgroundColor.label            "āĻĒāϟāĻ­ā§‚āĻŽāĻŋāϰ āϰāĻ‚ (B):">
+<!ENTITY backgroundColor.accessKey        "B">
+<!ENTITY AlignLeft.label                  "āĻŦāĻžāĻŽ">
+<!ENTITY AlignCenter.label                "āϕ⧇āĻ¨ā§āĻĻā§āϰ">
+<!ENTITY AlignRight.label                 "āĻĄāĻžāύ">
--- 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 "āĻĢāĻžāχāϞ (F)">
-<!ENTITY fileMenu.accesskey "F">
-<!ENTITY newMenu.label "āύāϤ⧁āύ (N)">
-<!ENTITY newMenu.accesskey "N">
+<!ENTITY fileMenu.label          "āĻĢāĻžāχāϞ (F)">
+<!ENTITY fileMenu.accesskey        "F">
+<!ENTITY newMenu.label            "āύāϤ⧁āύ (N)">
+<!ENTITY newMenu.accesskey          "N">
 
-<!ENTITY editMenu.label "āϏāĻŽā§āĻĒāĻžāĻĻāύāĻž (E)">
-<!ENTITY editMenu.accesskey "E">
-<!ENTITY undoCmd.label "āĻĒā§‚āĻ°ā§āĻŦāĻžāĻŦāĻ¸ā§āĻĨāĻžā§Ÿ āĻĢāĻŋāϰāĻŋā§Ÿā§‡ āφāύāĻž (U)">
-<!ENTITY undoCmd.key "Z">
-<!ENTITY undoCmd.accesskey "U">
-<!ENTITY redoCmd.label "āĻĒ⧁āύāϰāĻžā§Ÿ āĻ•āϰāĻž (R)">
-<!ENTITY redoCmd.key "Y">
-<!ENTITY redoCmd.accesskey "R">
-<!ENTITY cutCmd.label "āĻ•āĻžāϟāĻž (t)">
-<!ENTITY cutCmd.key "X">
-<!ENTITY cutCmd.accesskey "t">
-<!ENTITY copyCmd.label "āĻ…āύ⧁āϞāĻŋāĻĒāĻŋ (C)">
-<!ENTITY copyCmd.key "C">
-<!ENTITY copyCmd.accesskey "C">
-<!ENTITY pasteCmd.label "āĻĒā§āϰāϤāĻŋāϞ⧇āĻĒāύ (P)">
-<!ENTITY pasteCmd.key "V">
-<!ENTITY pasteCmd.accesskey "P">
-<!ENTITY deleteCmd.label "āĻŽā§āϛ⧇ āĻĢ⧇āϞāĻž (D)">
-<!ENTITY deleteCmd.accesskey "D">
-<!ENTITY selectAllCmd.label "āϏāĻŦ āύāĻŋāĻ°ā§āĻŦāĻžāϚāύ (A)">
-<!ENTITY selectAllCmd.key "A">
-<!ENTITY selectAllCmd.accesskey "A">
-<!ENTITY preferencesCmd.label "āĻ…āĻĒāĻļāύâ€Ļ (O)">
-<!ENTITY preferencesCmd.accesskey "O">
-<!ENTITY preferencesCmdUnix.label "āĻĒāĻ›āĻ¨ā§āĻĻāϏāĻŽā§‚āĻš (n)">
-<!ENTITY preferencesCmdUnix.accesskey "n">
+<!ENTITY editMenu.label          "āϏāĻŽā§āĻĒāĻžāĻĻāύāĻž (E)">
+<!ENTITY editMenu.accesskey        "E">
+<!ENTITY undoCmd.label            "āĻĒā§‚āĻ°ā§āĻŦāĻžāĻŦāĻ¸ā§āĻĨāĻžā§Ÿ āĻĢāĻŋāϰāĻŋā§Ÿā§‡ āφāύāĻž (U)">
+<!ENTITY undoCmd.key            "Z">
+<!ENTITY undoCmd.accesskey          "U">
+<!ENTITY redoCmd.label            "āĻĒ⧁āύāϰāĻžā§Ÿ āĻ•āϰāĻž (R)">
+<!ENTITY redoCmd.key            "Y">
+<!ENTITY redoCmd.accesskey          "R">
+<!ENTITY cutCmd.label            "āĻ•āĻžāϟāĻž (t)">
+<!ENTITY cutCmd.key              "X">
+<!ENTITY cutCmd.accesskey          "t">
+<!ENTITY copyCmd.label            "āĻ…āύ⧁āϞāĻŋāĻĒāĻŋ (C)">
+<!ENTITY copyCmd.key            "C">
+<!ENTITY copyCmd.accesskey          "C">
+<!ENTITY pasteCmd.label            "āĻĒā§āϰāϤāĻŋāϞ⧇āĻĒāύ (P)">
+<!ENTITY pasteCmd.key            "V">
+<!ENTITY pasteCmd.accesskey          "P">
+<!ENTITY deleteCmd.label          "āĻŽā§āϛ⧇ āĻĢ⧇āϞāĻž (D)">
+<!ENTITY deleteCmd.accesskey        "D">
+<!ENTITY selectAllCmd.label          "āϏāĻŦ āύāĻŋāĻ°ā§āĻŦāĻžāϚāύ (A)">
+<!ENTITY selectAllCmd.key          "A">
+<!ENTITY selectAllCmd.accesskey        "A">
+<!ENTITY preferencesCmd.label        "āĻ…āĻĒāĻļāύâ€Ļ (O)">
+<!ENTITY preferencesCmd.accesskey      "O">
+<!ENTITY preferencesCmdUnix.label       "āĻĒāĻ›āĻ¨ā§āĻĻāϏāĻŽā§‚āĻš (n)">
+<!ENTITY preferencesCmdUnix.accesskey     "n">
 
-<!ENTITY viewMenu.label "āĻĒā§āϰāĻĻāĻ°ā§āĻļāύ (V)">
-<!ENTITY viewMenu.accesskey "V">
-<!ENTITY viewToolbarsMenu.label "āϟ⧁āϞāĻŦāĻžāϰ (T)">
-<!ENTITY viewToolbarsMenu.accesskey "T">
-<!ENTITY showTaskbarCmd.label "āĻ¸ā§āĻŸā§āϝāĻžāϟāĻžāϏ āĻŦāĻžāϰ (S)">
-<!ENTITY showTaskbarCmd.accesskey "S">
+<!ENTITY viewMenu.label          "āĻĒā§āϰāĻĻāĻ°ā§āĻļāύ (V)">
+<!ENTITY viewMenu.accesskey        "V">
+<!ENTITY viewToolbarsMenu.label        "āϟ⧁āϞāĻŦāĻžāϰ (T)">
+<!ENTITY viewToolbarsMenu.accesskey      "T">
+<!ENTITY showTaskbarCmd.label          "āĻ¸ā§āĻŸā§āϝāĻžāϟāĻžāϏ āĻŦāĻžāϰ (S)">
+<!ENTITY showTaskbarCmd.accesskey        "S">
 
-<!ENTITY proxy.label "āĻĒā§āϰāĻ•ā§āϏāĻŋ āĻ•āύāĻĢāĻŋāĻ—āĻžāϰ⧇āĻļāύâ€Ļ (C)">
-<!ENTITY proxy.accesskey "C">
+<!ENTITY proxy.label                                    "āĻĒā§āϰāĻ•ā§āϏāĻŋ āĻ•āύāĻĢāĻŋāĻ—āĻžāϰ⧇āĻļāύâ€Ļ (C)">
+<!ENTITY proxy.accesskey                                "C">
 
-<!ENTITY closeCmd.label "āĻŦāĻ¨ā§āϧ (C)">
-<!ENTITY closeCmd.key "W">
-<!ENTITY closeCmd.accesskey "C">
+<!ENTITY closeCmd.label      "āĻŦāĻ¨ā§āϧ (C)">
+<!ENTITY closeCmd.key      "W">
+<!ENTITY closeCmd.accesskey    "C">
 
-<!ENTITY quitApplicationCmd.label "āĻĒā§āϰāĻ¸ā§āĻĨāĻžāύ (x)">
-<!ENTITY quitApplicationCmd.key "Q">
-<!ENTITY quitApplicationCmd.accesskey "x">
+<!ENTITY quitApplicationCmd.label  "āĻĒā§āϰāĻ¸ā§āĻĨāĻžāύ (x)">
+<!ENTITY quitApplicationCmd.key    "Q">
+<!ENTITY quitApplicationCmd.accesskey  "x">
 
-<!ENTITY quitApplicationCmdUnix.label "āĻĒā§āϰāĻ¸ā§āĻĨāĻžāύ (Q)">
-<!ENTITY quitApplicationCmdUnix.accesskey "Q">
+<!ENTITY quitApplicationCmdUnix.label  "āĻĒā§āϰāĻ¸ā§āĻĨāĻžāύ (Q)">
+<!ENTITY quitApplicationCmdUnix.accesskey  "Q">
 
-<!ENTITY quitApplicationCmdMac.label "&brandShortName; āĻĨ⧇āϕ⧇ āĻĒā§āϰāĻ¸ā§āĻĨāĻžāύ (Q)">
-<!ENTITY quitApplicationCmdMac.accesskey "Q">
+<!ENTITY quitApplicationCmdMac.label  "&brandShortName; āĻĨ⧇āϕ⧇ āĻĒā§āϰāĻ¸ā§āĻĨāĻžāύ (Q)">
+<!ENTITY quitApplicationCmdMac.accesskey  "Q">
--- a/mail/chrome/messenger-newsblog/feed-properties.dtd
+++ b/mail/chrome/messenger-newsblog/feed-properties.dtd
@@ -1,19 +1,19 @@
 <!-- Feed Properties Dialog -->
-<!ENTITY window.title "āĻĢāĻŋāĻĄ āĻŦ⧈āĻļāĻŋāĻˇā§āĻŸā§āϝ">
+<!ENTITY window.title             "āĻĢāĻŋāĻĄ āĻŦ⧈āĻļāĻŋāĻˇā§āĻŸā§āϝ">
 
-<!ENTITY feedFolder.label "āύāĻŋāĻŦāĻ¨ā§āϧ āĻāĻ–āĻžāύ⧇ āϜāĻŽāĻž āĻ•āϰāĻž āĻšāĻŦ⧇ (S):">
-<!ENTITY feedFolder.accesskey "S">
+<!ENTITY feedFolder.label         "āύāĻŋāĻŦāĻ¨ā§āϧ āĻāĻ–āĻžāύ⧇ āϜāĻŽāĻž āĻ•āϰāĻž āĻšāĻŦ⧇ (S):">
+<!ENTITY feedFolder.accesskey     "S">
 
-<!ENTITY feedLocation.label "āĻĢāĻŋāĻĄ URL (F):">
-<!ENTITY feedLocation.accesskey "F">
+<!ENTITY feedLocation.label       "āĻĢāĻŋāĻĄ URL (F):">
+<!ENTITY feedLocation.accesskey   "F">
 
-<!ENTITY choosethisfolder.label "āĻāχ āĻĢā§‹āĻ˛ā§āĻĄāĻžāϰāϟāĻŋ āĻŦ⧇āϛ⧇ āĻ¨ā§‡ā§ŸāĻž āĻšāĻŦ⧇">
+<!ENTITY choosethisfolder.label   "āĻāχ āĻĢā§‹āĻ˛ā§āĻĄāĻžāϰāϟāĻŋ āĻŦ⧇āϛ⧇ āĻ¨ā§‡ā§ŸāĻž āĻšāĻŦ⧇">
 
-<!ENTITY quickMode.label "āĻ“ā§Ÿā§‡āĻŦāĻĒ⧇āϜ āϞ⧋āĻĄ āĻ•āϰāĻžāϰ āĻĒāϰāĻŋāĻŦāĻ°ā§āϤ⧇ āύāĻŋāĻŦāĻ¨ā§āϧ⧇āϰ āϏāĻžāϰāϏāĻ‚āĻ•ā§āώ⧇āĻĒ āĻĻ⧇āĻ–āĻžāύ⧋ āĻšāĻŦ⧇ (h)">
-<!ENTITY quickMode.accesskey "h">
+<!ENTITY quickMode.label          "āĻ“ā§Ÿā§‡āĻŦāĻĒ⧇āϜ āϞ⧋āĻĄ āĻ•āϰāĻžāϰ āĻĒāϰāĻŋāĻŦāĻ°ā§āϤ⧇ āύāĻŋāĻŦāĻ¨ā§āϧ⧇āϰ āϏāĻžāϰāϏāĻ‚āĻ•ā§āώ⧇āĻĒ āĻĻ⧇āĻ–āĻžāύ⧋ āĻšāĻŦ⧇ (h)">
+<!ENTITY quickMode.accesskey      "h">
 
-<!ENTITY copyLinkCmd.label "āϏāĻ‚āϝ⧋āϗ⧇āϰ āĻ…āĻŦāĻ¸ā§āĻĨāĻžāύ āĻ…āύ⧁āϞāĻŋāĻĒāĻŋ āĻ•āϰāĻž āĻšāĻŦ⧇ (C)">
-<!ENTITY copyLinkCmd.accesskey "C">
+<!ENTITY copyLinkCmd.label        "āϏāĻ‚āϝ⧋āϗ⧇āϰ āĻ…āĻŦāĻ¸ā§āĻĨāĻžāύ āĻ…āύ⧁āϞāĻŋāĻĒāĻŋ āĻ•āϰāĻž āĻšāĻŦ⧇ (C)">
+<!ENTITY copyLinkCmd.accesskey    "C">
 
-<!ENTITY pasteLinkCmd.label "āĻĒā§āϰāϤāĻŋāϞ⧇āĻĒāύ (P)">
-<!ENTITY pasteLinkCmd.accesskey "P">
+<!ENTITY pasteLinkCmd.label       "āĻĒā§āϰāϤāĻŋāϞ⧇āĻĒāύ (P)">
+<!ENTITY pasteLinkCmd.accesskey   "P">
--- a/mail/chrome/messenger-newsblog/feed-subscriptions.dtd
+++ b/mail/chrome/messenger-newsblog/feed-subscriptions.dtd
@@ -1,18 +1,18 @@
 <!-- Subscription Dialog -->
 <!ENTITY feedSubscriptions.label "āĻĢāĻŋāĻĄ āϏāĻžāĻŦāĻ¸ā§āĻ•ā§āϰāĻŋāĻĒāĻļāύ">
 <!ENTITY subscriptionDesc.label "āύ⧋āϟ: āĻāĻ•āϟāĻŋ āĻĢāĻŋāĻĄā§‡āϰ āϜāĻ¨ā§āϝ āĻĢā§‹āĻ˛ā§āĻĄāĻžāϰ āϏāϰāĻžāύ⧋ āĻŦāĻž āĻĒāϰāĻŋāĻŦāĻ°ā§āϤāύ āĻ•āϰāĻž āĻšāϞ⧇ āĻĒā§‚āĻ°ā§āĻŦāĻŦāĻ°ā§āϤ⧀āϤ⧇ āĻĄāĻžāωāύāϞ⧋āĻĄ āĻ•āϰāĻž āύāĻŋāĻŦāĻ¨ā§āϧāϗ⧁āϞ⧋ āĻĒā§āϰāĻ­āĻžāĻŦāĻŋāϤ āĻšāĻŦ⧇ āύāĻžāĨ¤">
 <!ENTITY feedTitle.label "āĻļāĻŋāϰ⧋āύāĻžāĻŽ:">
-<!ENTITY location.label "āĻ…āĻŦāĻ¸ā§āĻĨāĻžāύ:">
+<!ENTITY location.label  "āĻ…āĻŦāĻ¸ā§āĻĨāĻžāύ:">
 
-<!ENTITY button.addFeed.label "āϝ⧋āĻ— (A)">
-<!ENTITY button.addFeed.accesskey "A">
-<!ENTITY button.editFeed.label "āϏāĻŽā§āĻĒāĻžāĻĻāύāĻž (E)">
-<!ENTITY button.editFeed.accesskey "E">
+<!ENTITY button.addFeed.label       "āϝ⧋āĻ— (A)">
+<!ENTITY button.addFeed.accesskey   "A">
+<!ENTITY button.editFeed.label      "āϏāĻŽā§āĻĒāĻžāĻĻāύāĻž (E)">
+<!ENTITY button.editFeed.accesskey  "E">
 <!ENTITY button.removeFeed.label "āϏāϰāĻžāύ⧋ (R)">
-<!ENTITY button.removeFeed.accesskey "R">
+<!ENTITY button.removeFeed.accesskey   "R">
 <!ENTITY button.importOPML.label "āχāĻŽā§āĻĒā§‹āĻ°ā§āϟ (I)">
-<!ENTITY button.importOPML.accesskey "I">
+<!ENTITY button.importOPML.accesskey   "I">
 <!ENTITY button.exportOPML.label "āĻāĻ•ā§āϏāĻĒā§‹āĻ°ā§āϟ (x)">
-<!ENTITY button.exportOPML.accesskey "x">
+<!ENTITY button.exportOPML.accesskey   "x">
 
-<!ENTITY cmd.close.commandKey "w">
+<!ENTITY cmd.close.commandKey             "w">
--- a/mail/chrome/messenger/FilterEditor.dtd
+++ b/mail/chrome/messenger/FilterEditor.dtd
@@ -1,10 +1,10 @@
 <!ENTITY window.title "āĻĒāϰāĻŋāĻļā§‹āϧāĻ• āύāĻŋ⧟āĻŽāĻžāĻŦāϞ⧀">
-
+<!ENTITY filterEditorDialog.dimensions "width: 100ch;">
 <!ENTITY filterName.label "āĻĒāϰāĻŋāĻļā§‹āϧāϕ⧇āϰ āύāĻžāĻŽ: (i)">
 <!ENTITY filterName.accesskey "i">
 
 <!ENTITY junk.label "āĻ…āĻĒā§āĻ°ā§Ÿā§‹āϜāĻ¨ā§€ā§Ÿ">
 <!ENTITY notJunk.label "āĻ…āĻĒā§āĻ°ā§Ÿā§‹āϜāĻ¨ā§€ā§Ÿ āύ⧟">
 
 <!ENTITY lowestPriorityCmd.label "āϏāĻŦāĻšā§‡ā§Ÿā§‡ āĻ•āĻŽ">
 <!ENTITY lowPriorityCmd.label "āĻ•āĻŽ">
--- a/mail/chrome/messenger/SearchDialog.dtd
+++ b/mail/chrome/messenger/SearchDialog.dtd
@@ -1,41 +1,41 @@
 <!-- for SearchDialog.xul -->
-<!ENTITY searchHeading.label "āĻŦāĻžāĻ°ā§āϤāĻž āĻ–ā§‹āρāϜāĻž āĻšāĻŦ⧇ āĻāĻ–āĻžāύ⧇ (h):">
-<!ENTITY searchHeading.accesskey "h">
-<!ENTITY searchSubfolders.label "āϏāĻžāĻŦāĻĢā§‹āĻ˛ā§āĻĄāĻžāϰ⧇ āĻ–ā§‹āρāϜāĻž āĻšāĻŦ⧇ (e)">
-<!ENTITY searchSubfolders.accesskey "e">
-<!ENTITY searchOnServer.label "āϏāĻžāĻ°ā§āĻ­āĻžāϰ⧇ āĻ…āύ⧁āϏāĻ¨ā§āϧāĻžāύ āĻ•āϰāĻž āĻšāĻŦ⧇ (u)">
-<!ENTITY searchOnServer.accesskey "u">
-<!ENTITY resetButton.label "āĻĒāϰāĻŋāĻˇā§āĻ•āĻžāϰ (C)">
-<!ENTITY resetButton.accesskey "C">
-<!ENTITY openButton.label "āϖ⧁āϞ⧁āύ (n)">
-<!ENTITY openButton.accesskey "n">
-<!ENTITY deleteButton.label "āĻŽā§āϛ⧇ āĻĢ⧇āϞ⧁āύ (D)">
-<!ENTITY deleteButton.accesskey "D">
-<!ENTITY searchDialogTitle.label "āĻŦāĻžāĻ°ā§āϤāĻž āĻ…āύ⧁āϏāĻ¨ā§āϧāĻžāύ">
-<!ENTITY results.label "āĻĢāϞāĻžāĻĢāϞ">
-<!ENTITY fileHereMenu.label "āĻāĻ–āĻžāύ⧇ āĻĢāĻžāχāϞ āĻ•āϰ⧁āύ(F)">
-<!ENTITY fileHereMenu.accesskey "F">
-<!ENTITY fileButton.label "āĻĢāĻžāχāϞ (i)">
-<!ENTITY fileButton.accesskey "i">
-<!ENTITY closeCmd.key "W">
-<!ENTITY openInFolder.label "āĻĢā§‹āĻ˛ā§āĻĄāĻžāϰ⧇ āĻ–ā§‹āϞāĻž āĻšāĻŦ⧇ (r)">
-<!ENTITY openInFolder.accesskey "r">
-<!ENTITY saveAsVFButton.label "āĻ…āύ⧁āϏāĻ¨ā§āϧāĻžāύ āĻĢā§‹āĻ˛ā§āĻĄāĻžāϰ āĻšāĻŋāϏ⧇āĻŦ⧇ āϏāĻ‚āϰāĻ•ā§āώāĻŖ (v)">
-<!ENTITY saveAsVFButton.accesskey "v">
+<!ENTITY searchHeading.label         "āĻŦāĻžāĻ°ā§āϤāĻž āĻ–ā§‹āρāϜāĻž āĻšāĻŦ⧇ āĻāĻ–āĻžāύ⧇ (h):">
+<!ENTITY searchHeading.accesskey     "h">
+<!ENTITY searchSubfolders.label      "āϏāĻžāĻŦāĻĢā§‹āĻ˛ā§āĻĄāĻžāϰ⧇ āĻ–ā§‹āρāϜāĻž āĻšāĻŦ⧇ (e)">
+<!ENTITY searchSubfolders.accesskey  "e">
+<!ENTITY searchOnServer.label        "āϏāĻžāĻ°ā§āĻ­āĻžāϰ⧇ āĻ…āύ⧁āϏāĻ¨ā§āϧāĻžāύ āĻ•āϰāĻž āĻšāĻŦ⧇ (u)">
+<!ENTITY searchOnServer.accesskey    "u">
+<!ENTITY resetButton.label           "āĻĒāϰāĻŋāĻˇā§āĻ•āĻžāϰ (C)">
+<!ENTITY resetButton.accesskey       "C">
+<!ENTITY openButton.label            "āϖ⧁āϞ⧁āύ (n)">
+<!ENTITY openButton.accesskey        "n">
+<!ENTITY deleteButton.label          "āĻŽā§āϛ⧇ āĻĢ⧇āϞ⧁āύ (D)">
+<!ENTITY deleteButton.accesskey      "D">
+<!ENTITY searchDialogTitle.label     "āĻŦāĻžāĻ°ā§āϤāĻž āĻ…āύ⧁āϏāĻ¨ā§āϧāĻžāύ">
+<!ENTITY results.label               "āĻĢāϞāĻžāĻĢāϞ">
+<!ENTITY fileHereMenu.label          "āĻāĻ–āĻžāύ⧇ āĻĢāĻžāχāϞ āĻ•āϰ⧁āύ(F)">
+<!ENTITY fileHereMenu.accesskey      "F">
+<!ENTITY fileButton.label            "āĻĢāĻžāχāϞ (i)">
+<!ENTITY fileButton.accesskey        "i">
+<!ENTITY closeCmd.key                "W">
+<!ENTITY openInFolder.label          "āĻĢā§‹āĻ˛ā§āĻĄāĻžāϰ⧇ āĻ–ā§‹āϞāĻž āĻšāĻŦ⧇ (r)">
+<!ENTITY openInFolder.accesskey      "r">
+<!ENTITY saveAsVFButton.label        "āĻ…āύ⧁āϏāĻ¨ā§āϧāĻžāύ āĻĢā§‹āĻ˛ā§āĻĄāĻžāϰ āĻšāĻŋāϏ⧇āĻŦ⧇ āϏāĻ‚āϰāĻ•ā§āώāĻŖ (v)">
+<!ENTITY saveAsVFButton.accesskey    "v">
 <!-- for ABSearchDialog.xul -->
 
-<!ENTITY abSearchHeading.label "āĻ–ā§‹āρāϜāĻž āĻšāĻŦ⧇ (h):">
-<!ENTITY abSearchHeading.accesskey "h">
-<!ENTITY propertiesButton.label "āĻŦ⧈āĻļāĻŋāĻˇā§āĻŸā§āϝ (P)">
-<!ENTITY propertiesButton.accesskey "P">
-<!ENTITY composeButton.label "āϞāĻŋāϖ⧁āύ (W)">
-<!ENTITY composeButton.accesskey "W">
-<!ENTITY abSearchDialogTitle.label "āωāĻ¨ā§āύāϤ āĻ āĻŋāĻ•āĻžāύāĻž āĻŦāχ āĻ…āύ⧁āϏāĻ¨ā§āϧāĻžāύ">
+<!ENTITY abSearchHeading.label       "āĻ–ā§‹āρāϜāĻž āĻšāĻŦ⧇ (h):">
+<!ENTITY abSearchHeading.accesskey   "h">
+<!ENTITY propertiesButton.label      "āĻŦ⧈āĻļāĻŋāĻˇā§āĻŸā§āϝ (P)">
+<!ENTITY propertiesButton.accesskey  "P">
+<!ENTITY composeButton.label         "āϞāĻŋāϖ⧁āύ (W)">
+<!ENTITY composeButton.accesskey     "W">
+<!ENTITY abSearchDialogTitle.label   "āωāĻ¨ā§āύāϤ āĻ āĻŋāĻ•āĻžāύāĻž āĻŦāχ āĻ…āύ⧁āϏāĻ¨ā§āϧāĻžāύ">
 <!-- Thread Pane -->
 
 <!ENTITY threadColumn.label "āĻĨā§āϰ⧇āĻĄ">
 <!ENTITY fromColumn.label "āĻĒā§āϰ⧇āϰāĻ•">
 <!ENTITY recipientColumn.label "āĻĒā§āϰāĻžāĻĒāĻ•">
 <!ENTITY subjectColumn.label "āĻŦāĻŋāώ⧟">
 <!ENTITY dateColumn.label "āϤāĻžāϰāĻŋāĻ–">
 <!ENTITY priorityColumn.label "āĻ…āĻ—ā§āϰāĻžāϧāĻŋāĻ•āĻžāϰ">
--- a/mail/chrome/messenger/aboutDialog.dtd
+++ b/mail/chrome/messenger/aboutDialog.dtd
@@ -1,16 +1,83 @@
-<!ENTITY aboutDialog.title "&brandFullName; āĻĒāϰāĻŋāϚāĻŋāϤāĻŋ">
-<!ENTITY aboutButton.label "&lt; āĻĒā§‚āĻ°ā§āĻŦāĻŦāĻ°ā§āϤ⧀ (B)">
-<!ENTITY aboutButton.accesskey "B">
-<!ENTITY aboutVersion "āϏāĻ‚āĻ¸ā§āĻ•āϰāĻŖ">
-<!ENTITY aboutMenu.label "āĻĒāϰāĻŋāϚāĻŋāϤāĻŋ (A)">
-<!ENTITY aboutMenu.accesskey "A">
-<!ENTITY aboutCredits.label "āĻ•ā§ƒāϤāĻŋāĻ¤ā§āĻŦ (C)">
-<!ENTITY aboutCredits.accesskey "C">
-<!ENTITY aboutRights.label "āφāĻĒāύāĻžāϰ āĻ…āϧāĻŋāĻ•āĻžāϰ (R)">
-<!ENTITY aboutRights.accesskey "R">
-<!ENTITY aboutContributors.label "āĻ…āĻŦāĻĻāĻžāύāĻ•āĻžāϰ⧀ (o)">
-<!ENTITY aboutContributors.accesskey "o">
-<!ENTITY aboutLicense.label "āϞāĻžāχāϏ⧇āĻ¨ā§āϏ (L)">
-<!ENTITY aboutLicense.accesskey "L">
+<!ENTITY aboutDialog.title          "&brandFullName; āĻĒāϰāĻŋāϚāĻŋāϤāĻŋ">
+
+<!ENTITY community.start2           "&brandShortName; is designed by ">
+<!-- LOCALIZATION NOTE (community.mozillaLink): This is a link title that links to http://www.mozilla.org/. -->
+<!ENTITY community.mozillaLink      "&vendorShortName;">
+<!ENTITY community.middle2          ", a ">
+<!-- LOCALIZATION NOTE (community.creditsLink): This is a link title that links to about:credits. -->
+<!ENTITY community.creditsLink      "global community">
+<!ENTITY community.end2             " working together to make the Internet better. We believe that the Internet should be open, public, and accessible to everyone without any restrictions.">
+
+<!ENTITY contribute.start           "Sound interesting? ">
+<!-- LOCALIZATION NOTE (contribute.getInvolvedLink): This is a link title that links to http://www.mozilla.org/contribute/. -->
+<!ENTITY contribute.getInvolvedLink "Get involved!">
+<!ENTITY contribute.end             "">
+<!-- LOCALIZATION NOTE (bottomLinks.license): This is a link title that links to about:license. -->
+
+<!ENTITY bottomLinks.license        "Licensing Information">
+<!-- LOCALIZATION NOTE (bottomLinks.rights): This is a link title that links to about:rights. -->
+
+<!ENTITY bottomLinks.rights         "End User Rights">
+<!-- LOCALIZATION NOTE (bottomLinks.privacy): This is a link title that links to http://www.mozilla.com/legal/privacy/. -->
+
+<!ENTITY bottomLinks.privacy        "Privacy Policy">
+<!-- LOCALIZATION NOTE (update.checkingForUpdates): try to make the localized text short (see bug 596813 for screenshots). -->
+
+<!ENTITY update.checkingForUpdates  "Checking for updatesâ€Ļ">
+<!-- LOCALIZATION NOTE (update.checkingAddonCompat): try to make the localized text short (see bug 596813 for screenshots). -->
+<!ENTITY update.checkingAddonCompat "Checking Add-on compatibilityâ€Ļ">
+<!-- LOCALIZATION NOTE (update.noUpdatesFound): try to make the localized text short (see bug 596813 for screenshots). -->
+<!ENTITY update.noUpdatesFound      "&brandShortName; is up to date">
+<!-- LOCALIZATION NOTE (update.adminDisabled): try to make the localized text short (see bug 596813 for screenshots). -->
+<!ENTITY update.adminDisabled       "Updates disabled by your system administrator">
+<!-- LOCALIZATION NOTE (update.failed.start,update.failed.linkText,update.failed.end):
+     update.failed.start, update.failed.linkText, and update.failed.end all go into
+     one line with linkText being wrapped in an anchor that links to a site to download
+     the latest version of Firefox (e.g. http://www.firefox.com). As this is all in
+     one line, try to make the localized text short (see bug 596813 for screenshots). -->
+
+<!ENTITY update.failed.start        "Update failed. ">
+<!ENTITY update.failed.linkText     "Download the latest version">
+<!ENTITY update.failed.end          "">
+<!-- LOCALIZATION NOTE (update.manual.start,update.manual.end): update.manual.start and update.manual.end
+     all go into one line and have an anchor in between with text that is the same as the link to a site
+     to download the latest version of Firefox (e.g. http://www.firefox.com). As this is all in one line,
+     try to make the localized text short (see bug 596813 for screenshots). -->
+
+<!ENTITY update.manual.start        "Download the ">
+<!ENTITY update.manual.linkText     "latest version">
+<!ENTITY update.manual.end          "">
+<!-- LOCALIZATION NOTE (update.downloading.start,update.downloading.end): update.downloading.start and 
+     update.downloading.end all go into one line, with the amount downloaded inserted in between. As this
+     is all in one line, try to make the localized text short (see bug 596813 for screenshots). The — is
+     the "em dash" (long dash).
+     example: Downloading update — 111 KB of 13 MB -->
+
+<!ENTITY update.downloading.start   "Downloading update — ">
+<!ENTITY update.downloading.end     "">
+<!-- LOCALIZATION NOTE (channel.description.start,channel.description.end): channel.description.start and
+     channel.description.end create one sentence, with the current channel label inserted in between.
+     example: You are currently on the _Stable_ update channel. -->
+
+<!ENTITY channel.description.start  "You are currently on the ">
+<!ENTITY channel.description.end    " update channel. ">
+
+<!ENTITY channel.change             "Change">
+
+<!ENTITY channel.release.description       "Enjoy the tried and tested final release being used by hundreds of millions around the world. Stay in control of your online experience with super speed, easy customization and the latest Web technologies.">
+<!ENTITY channel.beta.description          "Experience cutting edge features with more stability. Provide feedback to help refine and polish what will be in the final release.">
+<!ENTITY channel.aurora.description        "Experience the newest innovations in an unstable environment that's not for the faint of heart. Provide feedback on features and performance to help determine what makes the final release.">
+<!-- LOCALIZATION NOTE (channel.selector.start,channel.selector.end): channel.selector.start and
+     channel.selector.end create one sentence, with a channel selection menulist instered in between.
+     This is all in one line, so try to make the localized text short.
+     example: Switch to the [Stable] update channel. -->
+
+<!ENTITY channel.selector.start          "Switch to the">
+<!ENTITY channel.selector.end            "update channel.">
+<!-- LOCALIZATION NOTE (channel.selector.applyButton): This button applies the user's choice to switch
+     to a new update channel and starts the application update process. -->
+
+<!ENTITY channel.selector.applyButton    "Apply and Update">
+<!ENTITY channel.selector.cancelButton   "Cancel">
 
 <!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.title "āφāĻĒāύāĻžāϰ āĻ…āϧāĻŋāĻ•āĻžāϰ āϏāĻŽā§āĻĒāĻ°ā§āĻ•āĻŋāϤ">
-<!ENTITY rights.intro-header "āφāĻĒāύāĻžāϰ āĻ…āϧāĻŋāĻ•āĻžāϰ āϏāĻŽā§āĻĒāĻ°ā§āĻ•āĻŋāϤ">
+<!ENTITY rights.title            "āφāĻĒāύāĻžāϰ āĻ…āϧāĻŋāĻ•āĻžāϰ āϏāĻŽā§āĻĒāĻ°ā§āĻ•āĻŋāϤ">
+<!ENTITY rights.intro-header     "āφāĻĒāύāĻžāϰ āĻ…āϧāĻŋāĻ•āĻžāϰ āϏāĻŽā§āĻĒāĻ°ā§āĻ•āĻŋāϤ">
 <!ENTITY rights.intro "&brandFullName; āĻāĻ•āϟāĻŋ āĻŽā§āĻ•ā§āϤ āĻāĻŦāĻ‚ āĻ“āĻĒ⧇āύ āϏ⧋āĻ°ā§āϏ āϏāĻĢāϟāĻ“ā§Ÿā§āϝāĻžāϰ, āϝāĻž āϏāĻžāϰāĻž āĻŦāĻŋāĻļā§āĻŦ⧇āϰ āĻšāĻžāϜāĻžāϰ āĻšāĻžāϜāĻžāϰ āĻŽāĻžāύ⧁āώ⧇āϰ āĻ•āĻŽāĻŋāωāύāĻŋāϟāĻŋ āĻĻā§āĻŦāĻžāϰāĻž āϤ⧈āϰāĻŋ āĻ•āϰāĻž āĻšā§Ÿā§‡āϛ⧇āĨ¤ āĻ•āĻŋāϛ⧁ āϜāĻŋāύāĻŋāϏ āφāĻĒāύāĻžāϰ āϜāĻžāύāĻž āĻĒā§āĻ°ā§Ÿā§‹āϜāύ:">
 <!-- 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
--- a/mail/chrome/messenger/aboutSupportMail.dtd
+++ b/mail/chrome/messenger/aboutSupportMail.dtd
@@ -2,13 +2,14 @@
 
 <!ENTITY aboutSupport.accountsTitle "āĻŽā§‡āχāϞ āĻāĻŦāĻ‚ āύāϤ⧁āύ āĻ…ā§āϝāĻžāĻ•āĻžāωāĻ¨ā§āϟ">
 <!ENTITY aboutSupport.showPrivateData.mainText "āĻ…ā§āϝāĻžāĻ•āĻžāωāĻ¨ā§āϟ āύāĻžāĻŽāϏāĻš">
 <!ENTITY aboutSupport.showPrivateData.explanationText "(āϏāĻŽā§āĻ­āĻŦāϤ āϤāĻĨā§āϝ āϏāύāĻžāĻ•ā§āϤ āĻ•āϰāĻž āĻšāĻšā§āϛ⧇)">
 <!ENTITY aboutSupport.accountsID "āφāχāĻĄāĻŋ">
 <!ENTITY aboutSupport.accountsName "āύāĻžāĻŽ">
 <!ENTITY aboutSupport.accountsIncomingServer "āχāύāĻ•āĻžāĻŽāĻŋāĻ‚ āϏāĻžāĻ°ā§āĻ­āĻžāϰ">
 <!ENTITY aboutSupport.accountsOutgoingServers "āφāωāϟāĻ—ā§‹ā§ŸāĻŋāĻ‚ āϏāĻžāĻ°ā§āĻ­āĻžāϰ">
+<!ENTITY aboutSupport.accountsServerName "Name">
 <!ENTITY aboutSupport.accountsConnSecurity "āϏāĻ‚āϝ⧋āĻ— āύāĻŋāϰāĻžāĻĒāĻ¤ā§āϤāĻž">
 <!ENTITY aboutSupport.accountsAuthMethod "āĻĒā§āϰāĻŽāĻžāύ⧀āĻ•āϰāĻŖ āĻĒāĻĻā§āϧāϤāĻŋ">
 <!ENTITY aboutSupport.accountsDefault "āĻĒā§‚āĻ°ā§āĻŦāύāĻŋāĻ°ā§āϧāĻžāϰāĻŋāϤ?">
 
 <!ENTITY aboutSupport.sendViaEmail.label "āχāĻŽā§‡āχāϞ⧇āϰ āϏāĻžāĻšāĻžāĻ¯ā§āϝ⧇ āĻĒā§āϰ⧇āϰāĻŖ">
--- a/mail/chrome/messenger/accountCreation.dtd
+++ b/mail/chrome/messenger/accountCreation.dtd
@@ -1,78 +1,82 @@
-<!ENTITY autoconfigWizard.title "āĻŽā§‡āχāϞ āĻ…ā§āϝāĻžāĻ•āĻžāωāĻ¨ā§āϟ āĻŦā§āϝāĻŦāĻ¸ā§āĻĨāĻžāĻĒāύāĻž">
-<!ENTITY name.label "āφāĻĒāύāĻžāϰ āύāĻžāĻŽ (n)">
-<!ENTITY name.accesskey "n">
-<!ENTITY name.placeholder "āĻĒā§āϰāĻĨāĻŽ āĻļ⧇āώ">
-<!ENTITY name.text "āφāĻĒāύāĻžāϰ āύāĻžāĻŽ, āĻ…āĻ¨ā§āϝāϰāĻž āφāĻĒāύāĻžāϰ āϝ⧇ āύāĻžāĻŽāϟāĻŋ āĻĻ⧇āĻ–āĻŦ⧇">
-<!ENTITY email.label "āχāĻŽā§‡āχāϞ āĻ āĻŋāĻ•āĻžāύāĻž (l):">
-<!ENTITY email.accesskey "l">
-<!ENTITY email.placeholder "email@example.com">
-<!ENTITY password.label "āĻĒāĻžāϏāĻ“ā§ŸāĻžāĻ°ā§āĻĄ (P):">
-<!ENTITY password.accesskey "P">
-<!ENTITY password.placeholder "āĻĒāĻžāϏāĻ“ā§ŸāĻžāĻ°ā§āĻĄ">
-<!ENTITY password.text "āϐāĻšā§āĻ›āĻŋāĻ•, āĻļ⧁āϧ⧁ āĻŦā§āϝāĻŦāĻšāĻžāϰāĻ•āĻžāϰ⧀āϰ āύāĻžāĻŽā§‡āϰ āĻŦ⧈āϧāϤāĻž āϝāĻžāϚāĻžāχ āĻāϰ āϜāĻ¨ā§āϝ āĻŦā§āϝāĻŦāĻšāĻžāϰ āĻ•āϰāĻž āĻšāĻŦ⧇">
+<!ENTITY autoconfigWizard.title          "āĻŽā§‡āχāϞ āĻ…ā§āϝāĻžāĻ•āĻžāωāĻ¨ā§āϟ āĻŦā§āϝāĻŦāĻ¸ā§āĻĨāĻžāĻĒāύāĻž">
+<!ENTITY name.label                      "āφāĻĒāύāĻžāϰ āύāĻžāĻŽ (n)">
+<!ENTITY name.accesskey                  "n">
+<!ENTITY name.placeholder                "āĻĒā§āϰāĻĨāĻŽ āĻļ⧇āώ">
+<!ENTITY name.text                       "āφāĻĒāύāĻžāϰ āύāĻžāĻŽ, āĻ…āĻ¨ā§āϝāϰāĻž āφāĻĒāύāĻžāϰ āϝ⧇ āύāĻžāĻŽāϟāĻŋ āĻĻ⧇āĻ–āĻŦ⧇">
+<!ENTITY email.label                     "āχāĻŽā§‡āχāϞ āĻ āĻŋāĻ•āĻžāύāĻž (l):">
+<!ENTITY email.accesskey                 "l">
+<!ENTITY email.placeholder               "email@example.com">
+<!ENTITY password.label                  "āĻĒāĻžāϏāĻ“ā§ŸāĻžāĻ°ā§āĻĄ (P):">
+<!ENTITY password.accesskey              "P">
+<!ENTITY password.placeholder            "āĻĒāĻžāϏāĻ“ā§ŸāĻžāĻ°ā§āĻĄ">
+<!ENTITY password.text                   "āϐāĻšā§āĻ›āĻŋāĻ•, āĻļ⧁āϧ⧁ āĻŦā§āϝāĻŦāĻšāĻžāϰāĻ•āĻžāϰ⧀āϰ āύāĻžāĻŽā§‡āϰ āĻŦ⧈āϧāϤāĻž āϝāĻžāϚāĻžāχ āĻāϰ āϜāĻ¨ā§āϝ āĻŦā§āϝāĻŦāĻšāĻžāϰ āĻ•āϰāĻž āĻšāĻŦ⧇">
+<!ENTITY rememberPassword.label          "āĻĒāĻžāϏāĻ“ā§ŸāĻžāĻ°ā§āĻĄ āĻŽāύ⧇ āϰāĻžāϖ⧁āύ (m)">
+<!ENTITY rememberPassword.accesskey      "m">
 
-<!ENTITY accountInformation.label "āĻ…ā§āϝāĻžāĻ•āĻžāωāĻ¨ā§āϟ āϏāĻ‚āĻ•ā§āϰāĻžāĻ¨ā§āϤ āϤāĻĨā§āϝ">
-<!ENTITY username2.label "āĻŦā§āϝāĻŦāĻšāĻžāϰāĻ•āĻžāϰ⧀āϰ āύāĻžāĻŽ:">
-<!ENTITY incoming.label "āφāĻ—āϤ:">
-<!ENTITY outgoing.label "āĻŦāĻšāĻŋāĻ°ā§āĻ—āĻžāĻŽā§€:">
-<!ENTITY noEncryption.label "āϕ⧋āύāϟāĻŋ āύāĻž">
-<!ENTITY starttls.label "STARTTLS">
-<!ENTITY sslTls.label "SSL/TLS">
+<!ENTITY imapLong.label                  "IMAP (remote folders)">
+<!ENTITY pop3Long.label                  "POP3 (keep mail on your computer)">
 
-<!ENTITY imap.label "IMAP">
-<!ENTITY pop.label "POP">
-<!ENTITY smtp.label "SMTP">
-<!ENTITY imap.description "IMAP - āĻāĻ•āĻžāϧāĻŋāĻ• āĻ•āĻŽā§āĻĒāĻŋāωāϟāĻžāϰ āĻĨ⧇āϕ⧇ āĻŦāĻžāĻ°ā§āϤāĻžāϏāĻŽā§‚āĻšā§‡ āĻŦāĻž āĻĢā§‹āĻ˛ā§āĻĄāĻžāϰ⧇ āĻĒā§āϰāĻŦ⧇āĻļ āĻ•āϰ⧇">
-<!ENTITY pop.description "POP - āϏāĻ•āϞ āĻŦāĻžāĻ°ā§āϤāĻž āĻāχ āĻ•āĻŽā§āĻĒāĻŋāωāϟāĻžāϰ⧇ āĻĄāĻžāωāύāϞ⧋āĻĄ āĻ•āϰ⧇, āĻĢā§‹āĻ˛ā§āĻĄāĻžāϰāϏāĻŽā§‚āĻš āĻļ⧁āϧ⧁āĻŽāĻžāĻ¤ā§āϰ āĻ¸ā§āĻĨāĻžāĻ¨ā§€ā§Ÿ">
-<!ENTITY recommended-appendix.label "(āϏ⧁āĻĒāĻžāϰāĻŋāĻļāĻ•ā§ƒāϤ)">
+<!ENTITY incoming.label                  "āφāĻ—āϤ:">
+<!ENTITY outgoing.label                  "āĻŦāĻšāĻŋāĻ°ā§āĻ—āĻžāĻŽā§€:">
+<!ENTITY username.label                  "Username:">
+<!ENTITY hostname.label                  "Server hostname">
+<!ENTITY port.label                      "Port">
+<!ENTITY ssl.label                       "SSL">
+<!ENTITY auth.label                      "Authentication">
+<!ENTITY imap.label                      "IMAP">
+<!ENTITY pop3.label                       "POP3">
+<!ENTITY smtp.label                      "SMTP">
+<!ENTITY autodetect.label                "Autodetect">
+<!-- LOCALIZATION NOTE(noEncryption.label): Neither SSL/TLS nor STARTTLS.
+     Transmission of emails in cleartext over the Internet. -->
+<!ENTITY noEncryption.label              "āϕ⧋āύāϟāĻŋ āύāĻž">
+<!ENTITY starttls.label                  "STARTTLS">
+<!ENTITY sslTls.label                    "SSL/TLS">
 
-<!ENTITY manualSetup.label "āĻ¸ā§āĻŦāύāĻŋāĻ°ā§āϧāĻžāϰāĻŋāϤ āĻŦā§āϝāĻŦāĻ¸ā§āĻĨāĻžāĻĒāύāĻžâ€Ļ (S)">
-<!ENTITY manualSetup.accesskey "S">
-<!ENTITY cancel.label "āĻŦāĻžāϤāĻŋāϞ (a)">
-<!ENTITY cancel.accesskey "a">
-<!ENTITY continue.label "āĻĒāϰāĻŦāĻ°ā§āϤ⧀ (C)">
-<!ENTITY continue.accesskey "C">
-<!ENTITY startOver.label "āĻļ⧁āϰ⧁ āĻ•āϰ⧁āύ (o)">
-<!ENTITY startOver.accesskey "o">
-<!ENTITY stop.label "āĻŦāĻ¨ā§āϧ āĻ•āϰ⧁āύ (S)">
-<!ENTITY stop.accesskey "S">
-<!-- LOCALIZATION NOTE (retest.label): This is the text that is
-     displayed on the button which will re-guess the account configuration,
-     taking into account the settings the user has changed. -->
-<!ENTITY retest.label "āĻ•āύāĻĢāĻŋāĻ—āĻžāϰ⧇āĻļāύ āĻĒ⧁āύāϰāĻžā§Ÿ āĻĒāϰ⧀āĻ•ā§āώāĻž āĻ•āϰ⧁āύ (R)">
-<!ENTITY retest.accesskey "R">
-<!ENTITY edit.label "āϏāĻŽā§āĻĒāĻžāĻĻāύāĻž āĻ•āϰ⧁āύ (E)">
-<!ENTITY edit.accesskey "E">
+<!ENTITY advancedSetup.label             "Advanced config">
+<!ENTITY advancedSetup.accesskey         "A">
+<!ENTITY cancel.label                    "āĻŦāĻžāϤāĻŋāϞ (a)">
+<!ENTITY cancel.accesskey                "a">
+<!ENTITY continue.label                  "āĻĒāϰāĻŦāĻ°ā§āϤ⧀ (C)">
+<!ENTITY continue.accesskey              "C">
+<!ENTITY stop.label                      "āĻŦāĻ¨ā§āϧ āĻ•āϰ⧁āύ (S)">
+<!ENTITY stop.accesskey                  "S">
+<!-- LOCALIZATION NOTE (half-manual-test.label): This is the text that is
+     displayed on the button in manual edit mode which will re-guess
+     the account configuration, taking into account the settings that
+     the user has manually changed. -->
+<!ENTITY half-manual-test.label          "Re-test">
+<!ENTITY half-manual-test.accesskey      "t">
+<!ENTITY manual-edit.label               "Manual config">
+<!ENTITY manual-edit.accesskey           "M">
 
-<!ENTITY rememberPassword.label "āĻĒāĻžāϏāĻ“ā§ŸāĻžāĻ°ā§āĻĄ āĻŽāύ⧇ āϰāĻžāϖ⧁āύ (m)">
-<!ENTITY rememberPassword.accesskey "m">
 
-<!ENTITY warning.label "āϏāϤāĻ°ā§āϕ⧀āĻ•āϰāĻŖ!">
-<!ENTITY incomingSettings.label "āφāĻ—āϤ āϏ⧇āϟāĻŋāĻ‚āϏāĻŽā§‚āĻš:">
-<!ENTITY outgoingSettings.label "āĻŦāĻšāĻŋāĻ°ā§āĻ—āĻžāĻŽā§€ āϏ⧇āϟāĻŋāĻ‚āϏāĻŽā§‚āĻš:">
-<!ENTITY technicaldetails.label "āĻĒā§āϰāϝ⧁āĻ•ā§āϤāĻŋāĻ—āϤ āĻŦāĻ°ā§āĻŖāύāĻž">
+<!ENTITY warning.label                   "āϏāϤāĻ°ā§āϕ⧀āĻ•āϰāĻŖ!">
+<!ENTITY incomingSettings.label          "āφāĻ—āϤ āϏ⧇āϟāĻŋāĻ‚āϏāĻŽā§‚āĻš:">
+<!ENTITY outgoingSettings.label          "āĻŦāĻšāĻŋāĻ°ā§āĻ—āĻžāĻŽā§€ āϏ⧇āϟāĻŋāĻ‚āϏāĻŽā§‚āĻš:">
+<!ENTITY technicaldetails.label          "āĻĒā§āϰāϝ⧁āĻ•ā§āϤāĻŋāĻ—āϤ āĻŦāĻ°ā§āĻŖāύāĻž">
 <!-- LOCALIZATION NOTE (confirmWarning.label): If there is a security
      warning on the outgoing server, then the user will need to check a
      checkbox beside this text before continuing. -->
-<!ENTITY confirmWarning.label "āφāĻŽāĻŋ āĻā§āρāĻ•āĻŋ āĻŦ⧁āĻāĻŋ (u)">
-<!ENTITY confirmWarning.accesskey "u">
+<!ENTITY confirmWarning.label            "āφāĻŽāĻŋ āĻā§āρāĻ•āĻŋ āĻŦ⧁āĻāĻŋ (u)">
+<!ENTITY confirmWarning.accesskey        "u">
 <!-- LOCALIZATION NOTE (createAccount.label): If there is a security warning
      on the incoming or outgoing servers, then the page that pops up will
      have this text in a button to continue by creating the account. -->
-<!ENTITY createAccount.label "āĻ…ā§āϝāĻžāĻ•āĻžāωāĻ¨ā§āϟ āϤ⧈āϰāĻŋ āĻ•āϰ⧁āύ (C)">
-<!ENTITY createAccount.accesskey "C">
+<!ENTITY createAccount.label             "āĻ…ā§āϝāĻžāĻ•āĻžāωāĻ¨ā§āϟ āϤ⧈āϰāĻŋ āĻ•āϰ⧁āύ (C)">
+<!ENTITY createAccount.accesskey         "C">
 <!-- LOCALIZATION NOTE (changeSettings.label): If there is a security warning on
      the incoming or outgoing servers, then the page that pops up will have
      this text in a button to take you back to the previous page to change
      the settings and try again. -->
-<!ENTITY changeSettings.label "āϏ⧇āϟāĻŋāĻ‚ āĻĒāϰāĻŋāĻŦāĻ°ā§āϤāύ (S)">
-<!ENTITY changeSettings.accesskey "S">
+<!ENTITY changeSettings.label            "āϏ⧇āϟāĻŋāĻ‚ āĻĒāϰāĻŋāĻŦāĻ°ā§āϤāύ (S)">
+<!ENTITY changeSettings.accesskey        "S">
 
 <!ENTITY contactYourProvider.description "&brandShortName; āϝ⧇ āĻ•āύāĻĢāĻŋāĻ—āĻžāϰ⧇āĻļāύ āĻĻā§‡ā§ŸāĻž āφāϛ⧇ āϤāĻž āĻŦā§āϝāĻŦāĻšāĻžāϰ āĻ•āϰ⧇ āφāĻĒāύāĻžāϰ āχāĻŽā§‡āχāϞ āĻ—ā§āϰāĻšāĻŖ āĻ•āϰāϤ⧇ āĻĒāĻžāϰāĻŦ⧇āύāĨ¤ āωāĻĒāϰāĻ¨ā§āϤ⧁, āφāĻĒāύāĻŋ āĻāχ āĻāĻžāĻŽā§‡āϞāĻžāϝ⧁āĻ•ā§āϤ āϏāĻ‚āϝ⧋āϗ⧇āϰ āϏāĻžāĻĨ⧇ āϏāĻ‚āĻļā§āϞāĻŋāĻˇā§āϟ āĻĒā§āϰāĻļāĻžāϏāĻ• āĻŦāĻž āχāĻŽā§‡āχāϞ āϏāϰāĻŦāϰāĻžāĻšāĻ•āĻžāϰ⧀āϰ āϏāĻžāĻĨ⧇ āϝ⧋āĻ—āĻžāϝ⧋āĻ— āĻ•āϰ⧁āύāĨ¤ āφāϰāĻ“ āϤāĻĨā§āϝ⧇āϰ āϜāĻ¨ā§āϝ āĻĨāĻžāĻ¨ā§āĻĄāĻžāϰāĻŦāĻžāĻ°ā§āĻĄ FAQ āĻĻ⧇āϖ⧁āύāĨ¤">
 
-<!ENTITY insecureServer.tooltip.title "āϏāϤāĻ°ā§āϕ⧀āĻ•āϰāĻŖ! āĻāϟāĻŋ āĻāĻ•āϟāĻŋ āύāĻŋāϰāĻžāĻĒāĻ¤ā§āϤāĻžāĻšā§€āύ āϏāĻžāĻ°ā§āĻ­āĻžāϰāĨ¤">
-<!ENTITY insecureServer.tooltip.details "āφāϰāĻ“ āĻŦāĻŋāĻ¸ā§āϤāĻžāϰāĻŋāϤ āϤāĻĨā§āϝ⧇āϰ āϜāĻ¨ā§āϝ āĻŦ⧃āĻ¤ā§āϤ⧇ āĻ•ā§āϞāĻŋāĻ• āĻ•āϰ⧁āύāĨ¤">
+<!ENTITY insecureServer.tooltip.title    "āϏāϤāĻ°ā§āϕ⧀āĻ•āϰāĻŖ! āĻāϟāĻŋ āĻāĻ•āϟāĻŋ āύāĻŋāϰāĻžāĻĒāĻ¤ā§āϤāĻžāĻšā§€āύ āϏāĻžāĻ°ā§āĻ­āĻžāϰāĨ¤">
+<!ENTITY insecureServer.tooltip.details  "āφāϰāĻ“ āĻŦāĻŋāĻ¸ā§āϤāĻžāϰāĻŋāϤ āϤāĻĨā§āϝ⧇āϰ āϜāĻ¨ā§āϝ āĻŦ⧃āĻ¤ā§āϤ⧇ āĻ•ā§āϞāĻŋāĻ• āĻ•āϰ⧁āύāĨ¤">
 
 <!ENTITY insecureUnencrypted.description "āφāĻĒāύāĻžāϰ āχāĻŽā§‡āχāϞ āĻ“ āĻĒā§āϰāĻŽāĻžāĻŖā§€āĻ•āϰāĻŖ āφāύāĻāύāĻ•ā§āϰāĻŋāĻĒā§āϟ āĻ•āϰ⧇ āĻĒāĻžāĻ āĻžāύ⧋ āĻšā§Ÿā§‡āϛ⧇, āϏ⧁āϤāϰāĻžāĻ‚ āφāĻĒāύāĻžāϰ āĻĒāĻžāϏāĻ“ā§ŸāĻžāĻ°ā§āĻĄ (āĻāĻŦāĻ‚ āĻŦāĻžāĻ°ā§āϤāĻž) āĻ…āĻ¨ā§āϝ āϝ⧇ āϕ⧇āω āϏāĻšāĻœā§‡āχ āĻĒ⧜āϤ⧇ āĻĒāĻžāϰāĻŦ⧇āĨ¤ &brandShortName; āφāĻĒāύāĻžāϕ⧇ āφāĻĒāύāĻžāϰ āχāĻŽā§‡āχāϞ āĻ—ā§āϰāĻšāĻŖ āĻ•āϰāϤ⧇ āĻĻāĻŋāĻŦ⧇, āĻ•āĻŋāĻ¨ā§āϤ⧁ āφāĻĒāύāĻŋ āύāĻŋāϰāĻžāĻĒāĻĻ āϏāĻ‚āϝ⧋āĻ—āϏāĻš āϏāĻžāĻ°ā§āĻ­āĻžāϰāϕ⧇ āĻ•āύāĻĢāĻŋāĻ—āĻžāϰ āĻ•āϰāĻžāϰ āĻŦā§āϝāĻžāĻĒāĻžāϰ⧇ āφāĻĒāύāĻžāϰ āχāĻŽā§‡āχāϞ āϏāϰāĻŦāϰāĻžāĻšāĻ•āĻžāϰ⧀āϰ āϏāĻžāĻĨ⧇ āϝ⧋āĻ—āĻžāϝ⧋āĻ— āĻ•āϰ⧁āύāĨ¤">
-<!ENTITY insecureSelfSigned.description "āϏāĻžāĻ°ā§āĻ­āĻžāϰ āϝ⧇ āϏāĻžāĻ°ā§āϟāĻŋāĻĢāĻŋāϕ⧇āϟ āĻŦā§āϝāĻŦāĻšāĻžāϰ āĻ•āϰ⧇ āϤāĻž āφāĻŽāϰāĻž āĻŦāĻŋāĻļā§āĻŦāĻžāϏ āĻ•āϰāϤ⧇ āĻĒāĻžāϰāĻŋāύāĻž, āϏ⧁āϤāϰāĻžāĻ‚ āφāĻĒāύāĻžāϰ āϏāĻžāĻ°ā§āĻ­āĻžāϰ āĻ“ &brandShortName; āĻāϰ āĻŽāĻžāĻā§‡ āĻ…āĻ¨ā§āϝ āϕ⧇āω āφāϏāϛ⧇ āĻ•āĻŋāύāĻž āϤāĻžāϰ āĻŦā§āϝāĻžāĻĒāĻžāϰ⧇ āφāĻŽāĻžāϰāĻž āύāĻŋāĻļā§āϚāĻŋāϤ āύāĻžāĨ¤ &brandShortName; āφāĻĒāύāĻžāϕ⧇ āφāĻĒāύāĻžāϰ āχāĻŽā§‡āχāϞ āĻ—ā§āϰāĻšāĻŖ āĻ•āϰāϤ⧇ āĻĻāĻŋāĻŦ⧇ āĻ•āĻŋāĻ¨ā§āϤ⧁ āχāĻŽā§‡āχāϞ āϏāϰāĻŦāϰāĻžāĻšāĻ•āĻžāϰ⧀āϕ⧇ āĻŦāĻŋāĻļā§āĻŦāĻžāϏāϝ⧋āĻ—ā§āϝ āϏāĻžāĻ°ā§āϟāĻŋāĻĢāĻŋāϕ⧇āϟ āĻĻā§āĻŦāĻžāϰāĻž āϏāĻžāĻ°ā§āĻ­āĻžāϰ āĻ•āύāĻĢāĻŋāĻ—āĻžāϰ āĻ•āϰāϤ⧇ āĻšāĻŦ⧇āĨ¤">
-<!ENTITY secureServer.description "āĻ…āĻ­āĻŋāύāĻ¨ā§āĻĻāύ! āĻāϟāĻŋ āĻāĻ•āϟāĻŋ āύāĻŋāϰāĻžāĻĒāĻĻ āϏāĻžāĻ°ā§āĻ­āĻžāϰāĨ¤">
+<!ENTITY insecureSelfSigned.description  "āϏāĻžāĻ°ā§āĻ­āĻžāϰ āϝ⧇ āϏāĻžāĻ°ā§āϟāĻŋāĻĢāĻŋāϕ⧇āϟ āĻŦā§āϝāĻŦāĻšāĻžāϰ āĻ•āϰ⧇ āϤāĻž āφāĻŽāϰāĻž āĻŦāĻŋāĻļā§āĻŦāĻžāϏ āĻ•āϰāϤ⧇ āĻĒāĻžāϰāĻŋāύāĻž, āϏ⧁āϤāϰāĻžāĻ‚ āφāĻĒāύāĻžāϰ āϏāĻžāĻ°ā§āĻ­āĻžāϰ āĻ“ &brandShortName; āĻāϰ āĻŽāĻžāĻā§‡ āĻ…āĻ¨ā§āϝ āϕ⧇āω āφāϏāϛ⧇ āĻ•āĻŋāύāĻž āϤāĻžāϰ āĻŦā§āϝāĻžāĻĒāĻžāϰ⧇ āφāĻŽāĻžāϰāĻž āύāĻŋāĻļā§āϚāĻŋāϤ āύāĻžāĨ¤ &brandShortName; āφāĻĒāύāĻžāϕ⧇ āφāĻĒāύāĻžāϰ āχāĻŽā§‡āχāϞ āĻ—ā§āϰāĻšāĻŖ āĻ•āϰāϤ⧇ āĻĻāĻŋāĻŦ⧇ āĻ•āĻŋāĻ¨ā§āϤ⧁ āχāĻŽā§‡āχāϞ āϏāϰāĻŦāϰāĻžāĻšāĻ•āĻžāϰ⧀āϕ⧇ āĻŦāĻŋāĻļā§āĻŦāĻžāϏāϝ⧋āĻ—ā§āϝ āϏāĻžāĻ°ā§āϟāĻŋāĻĢāĻŋāϕ⧇āϟ āĻĻā§āĻŦāĻžāϰāĻž āϏāĻžāĻ°ā§āĻ­āĻžāϰ āĻ•āύāĻĢāĻŋāĻ—āĻžāϰ āĻ•āϰāϤ⧇ āĻšāĻŦ⧇āĨ¤">
+<!ENTITY secureServer.description        "āĻ…āĻ­āĻŋāύāĻ¨ā§āĻĻāύ! āĻāϟāĻŋ āĻāĻ•āϟāĻŋ āύāĻŋāϰāĻžāĻĒāĻĻ āϏāĻžāĻ°ā§āĻ­āĻžāϰāĨ¤">
--- a/mail/chrome/messenger/accountCreation.properties
+++ b/mail/chrome/messenger/accountCreation.properties
@@ -4,35 +4,43 @@
 cleartext_warning=%1$S āĻāύāĻ•ā§āϰāĻŋāĻĒāĻļāύ āĻŦā§āϝāĻŦāĻšāĻžāϰ āĻ•āϰ⧇ āύāĻžāĨ¤
 # LOCALIZATION NOTE(selfsigned_warning): %1$S will be the hostname of the server the user was trying to connect to.
 selfsigned_warning=%1$S āĻŦāĻŋāĻļā§āĻŦāĻžāϏāϝ⧋āĻ—ā§āϝ āϏāĻžāĻ°ā§āϟāĻŋāĻĢāĻŋāϕ⧇āϟ āĻŦā§āϝāĻŦāĻšāĻžāϰ āĻ•āϰ⧇ āύāĻžāĨ¤
 selfsigned_details=āϏāĻžāϧāĻžāϰāĻŖāĻ­āĻžāĻŦ⧇, āύāĻŋāϰāĻžāĻĒāĻĻ āĻŽā§‡āχāϞ āϏāĻžāĻ°ā§āĻ­āĻžāϰ āĻāĻ•āϟāĻŋ āĻŦāĻŋāĻļā§āĻŦāĻžāϏāϝ⧋āĻ—ā§āϝ āϏāĻžāĻ°ā§āϟāĻŋāĻĢāĻŋāϕ⧇āϟ āĻĻ⧇āĻ–āĻžāĻŦ⧇ āϝāĻž āĻĨ⧇āϕ⧇ āĻĒā§āϰāĻŽāĻžāĻŖ āĻĒāĻžāĻ“ā§ŸāĻž āϝāĻžā§Ÿ āϝ⧇ āĻāϟāĻŋ āĻĒā§āϰāĻ•ā§ƒāϤāĻĒāĻ•ā§āώ⧇āχ āϏ⧇āχ āϏāĻžāĻ°ā§āĻ­āĻžāϰāĨ¤ āĻŽā§‡āχāϞ āϏāĻžāĻ°ā§āĻ­āĻžāϰ āĻāύāĻ•ā§āϰāĻŋāĻĒā§āϟāĻ•ā§ƒāϤ āĻšāĻŦ⧇ āĻ•āĻŋāĻ¨ā§āϤ⧁ āϝāĻĨāĻžāϝāĻĨ āϏāĻžāĻ°ā§āĻ­āĻžāϰ āĻšāĻŋāϏāĻžāĻŦ⧇ āĻŦāĻŋāĻŦ⧇āϚāĻŋāϤ āĻšā§ŸāύāĻžāĨ¤
 cleartext_details=āĻ…āύāĻŋāϰāĻžāĻĒāĻĻ āĻŽā§‡āχāϞ āφāĻĒāύāĻžāϰ āĻĒāĻžāϏāĻ“ā§ŸāĻžāĻ°ā§āĻĄ āĻ“ āĻŦā§āϝāĻ•ā§āϤāĻŋāĻ—āϤ āϤāĻĨā§āϝ āϏāĻ‚āϰāĻ•ā§āώāĻŖ āĻ•āϰāĻžāϰ āϜāĻ¨ā§āϝ āĻāύāĻ•ā§āϰāĻŋāĻĒā§āϟāĻ•ā§ƒāϤ āϏāĻ‚āϝ⧋āĻ— āĻŦā§āϝāĻŦāĻšāĻžāϰ āĻ•āϰ⧇ āύāĻžāĨ¤ āĻāχ āϏāĻžāĻ°ā§āĻ­āĻžāϰ⧇ āϏāĻ‚āϝ⧋āĻ— āĻĻāĻŋā§Ÿā§‡ āφāĻĒāύāĻŋ āφāĻĒāύāĻžāϰ āĻĒāĻžāϏāĻ“ā§ŸāĻžāĻ°ā§āĻĄ āĻ“ āϤāĻĨā§āϝ āωāĻ¨ā§āĻŽā§āĻ•ā§āϤ āĻ•āϰ⧇ āĻĻāĻŋāϤ⧇ āĻĒāĻžāϰ⧇āύāĨ¤
 
 # LOCALIZATION NOTE(default_server_tag): Used to indicate the default smtp server in the server dropdown list.
 default_server_tag= (āĻĄāĻŋāĻĢāĻ˛ā§āϟ)
+# LOCALIZATION NOTE(port_auto): It must be short (4-5 characters max.).
+# Content of server port field (usually a number), used when the user didn't
+# enter anything yet and we'll automatically detect it later.
+port_auto=Auto
 
 # config titles
 # LOCALIZATION NOTE(looking_up_settings_disk): Referring to Thunderbird installation folder on user's harddisk. %1$S will be the brandShortName.
 looking_up_settings_disk=āĻ•āύāĻĢāĻŋāĻ—āĻžāϰ⧇āĻļāύ āĻĒāϰ⧀āĻ•ā§āώāĻž āĻ•āϰāĻž āĻšāĻšā§āϛ⧇: %1$S āχāύāĻ¸ā§āϟāϞ
 looking_up_settings_isp=āĻ•āύāĻĢāĻŋāĻ—āĻžāϰ⧇āĻļāύ āĻĒāϰ⧀āĻ•ā§āώāĻž āĻ•āϰāĻž āĻšāĻšā§āϛ⧇: āχāĻŽā§‡āχāϞ āϏāϰāĻŦāϰāĻžāĻšāĻ•āĻžāϰ⧀
 # LOCALIZATION NOTE(looking_up_settings_db): Do not translate or replace Mozilla. It stands for the public project mozilla.org, not Mozilla Messaging. The database is a generic, public domain facility usable by any client.
 looking_up_settings_db=āĻ•āύāĻĢāĻŋāĻ—āĻžāϰ⧇āĻļāύ āĻĒāϰ⧀āĻ•ā§āώāĻž āĻ•āϰāĻž āĻšāĻšā§āϛ⧇: āĻŽā§‹āϜāĻŋāϞāĻž ISP āĻĄāĻžāϟāĻžāĻŦ⧇āϏ
 # LOCALIZATION NOTE(looking_up_settings_guess): We are checking common server names like pop., pop3., smtp., mail., without knowing whether they exist or really serve this email account. If a server responds, we try to talk to it via POP/IMAP/SMTP protocols and query its capabilities. If that succeeds, we assume we found a configuration. Of course, it may still be wrong, but it often works.
 looking_up_settings_guess=āĻ•āύāĻĢāĻŋāĻ—āĻžāϰ⧇āĻļāύ āĻĒāϰ⧀āĻ•ā§āώāĻž āĻ•āϰāĻž āĻšāĻšā§āϛ⧇: āϏāĻžāϧāĻžāϰāĻŖ āϏāĻžāĻ°ā§āĻ­āĻžāϰ āύāĻžāĻŽ āĻšā§‡āĻˇā§āϟāĻž āĻ•āϰāĻž āĻšāĻšā§āϛ⧇
+looking_up_settings_halfmanual=Looking up configuration: Probing server
 # LOCALIZATION NOTE(found_settings_disk): Referring to Thunderbird installation folder on user's harddisk. %1$S will be the brandShortName.
 found_settings_disk=āύāĻŋāĻŽā§āύ⧋āĻ•ā§āϤ āϏ⧇āϟāĻŋāĻ‚ āĻĒāĻžāĻ“ā§ŸāĻž āĻ—āĻŋā§Ÿā§‡āϛ⧇: %1$S āχāύāĻ¸ā§āϟāϞ āĻĒā§āϰāĻ•ā§āϰāĻŋ⧟āĻž
 found_settings_isp=āύāĻŋāĻŽā§āύ⧋āĻ•ā§āϤ āϏ⧇āϟāĻŋāĻ‚ āĻĒāĻžāĻ“ā§ŸāĻž āĻ—āĻŋā§Ÿā§‡āϛ⧇: āχāĻŽā§‡āχāϞ āϏāϰāĻŦāϰāĻžāĻšāĻ•āĻžāϰ⧀
 # LOCALIZATION NOTE(found_settings_db): Do not translate or replace Mozilla. It stands for the public project mozilla.org, not Mozilla Messaging. The database is a generic, public domain facility usable by any client.
 found_settings_db=āύāĻŋāĻŽā§āύ⧋āĻ•ā§āϤ āϏ⧇āϟāĻŋāĻ‚ āĻĒāĻžāĻ“ā§ŸāĻž āĻ—āĻŋā§Ÿā§‡āϛ⧇: āĻŽā§‹āϜāĻŋāϞāĻž ISP āĻĄāĻžāϟāĻžāĻŦ⧇āϏ
 # LOCALIZATION NOTE(found_settings_guess): We tried common mail server names and we found a mail server and talked to it and it responded properly, so we think we found a suitable configuration, but we are only about 80% certain that it is the correct setting for this email address. There's a chance that email address may not actually be served by this server and it won't work, or that there is a better server.
 found_settings_guess=āϏāĻžāϧāĻžāϰāĻŖ āϏāĻžāĻ°ā§āĻ­āĻžāϰ āύāĻžāĻŽ āĻšā§‡āĻˇā§āϟāĻž āĻ•āϰ⧇ āύāĻŋāĻŽā§āύ⧋āĻ•ā§āϤ āϏ⧇āϟāĻŋāĻ‚ āĻĒāĻžāĻ“ā§ŸāĻž āĻ—āĻŋā§Ÿā§‡āϛ⧇
+found_settings_halfmanual=The following settings were found by probing the given server
 # LOCALIZATION NOTE(failed_to_find_settings): %1$S will be the brandShortName.
 failed_to_find_settings=āφāĻĒāύāĻžāϰ āχāĻŽā§‡āχāϞ āĻ…ā§āϝāĻžāĻ•āĻžāωāĻ¨ā§āĻŸā§‡āϰ āϜāĻ¨ā§āϝ āϏ⧇āϟāĻŋāĻ‚ āϖ⧁āρāϜāϤ⧇ %1$S āĻŦā§āϝāĻ°ā§āĻĨāĨ¤
 manually_edit_config=Config āϏāĻŽā§āĻĒāĻžāĻĻāύāĻž āĻ•āϰāĻž āĻšāĻšā§āϛ⧇
+# LOCALIZATION NOTE(guessed_settings_offline) User is offline, so we just took a wild guess and the user will have to enter the right settings.
+guessed_settings_offline=You are offline. We guessed some settings but you will need to enter the right settings.
 
 # config subtitles
 check_preconfig=āĻĒā§āϰāĻŋ-āĻ•āύāĻĢāĻŋāĻ—āĻžāϰ⧇āĻļāύ⧇āϰ āϜāĻ¨ā§āϝ āĻĒāϰ⧀āĻ•ā§āώāĻž āĻ•āϰāĻž āĻšāĻšā§āϛ⧇â€Ļ
 found_preconfig=āĻĒā§āϰāĻŋ-āĻ•āύāĻĢāĻŋāĻ—āĻžāϰ⧇āĻļāύ āĻĒāĻžāĻ“ā§ŸāĻž āĻ—āĻŋā§Ÿā§‡āϛ⧇
 checking_config=āĻ•āύāĻĢāĻŋāĻ—āĻžāϰ⧇āĻļāύ āĻĒāϰ⧀āĻ•ā§āώāĻž āĻ•āϰāĻž āĻšāĻšā§āϛ⧇â€Ļ
 found_config=āφāĻĒāύāĻžāϰ āĻ…ā§āϝāĻžāĻ•āĻžāωāĻ¨ā§āĻŸā§‡āϰ āĻ•āύāĻĢāĻŋāĻ—āĻžāϰ⧇āĻļāύ āĻĒāĻžāĻ“ā§ŸāĻž āĻ—āĻŋā§Ÿā§‡āϛ⧇
 checking_mozilla_config=āĻŽā§‹āϜāĻŋāϞāĻž āĻ•āĻŽāĻŋāωāύāĻŋāϟāĻŋ āĻ•āύāĻĢāĻŋāĻ—āĻžāϰ⧇āĻļāύ āĻĒāϰ⧀āĻ•ā§āώāĻž āĻ•āϰāĻž āĻšāĻšā§āϛ⧇â€Ļ
 found_isp_config=āĻ•āύāĻĢāĻŋāĻ—āĻžāϰ⧇āĻļāύ āĻĒāĻžāĻ“ā§ŸāĻž āĻ—āĻŋā§Ÿā§‡āϛ⧇
@@ -50,15 +58,41 @@ password_ok=āĻĒāĻžāϏāĻ“ā§ŸāĻžāĻ°ā§āĻĄ āĻ āĻŋāĻ• āφāϛ⧇!
 user_pass_invalid=āĻŦā§āϝāĻŦāĻšāĻžāϰāĻ•āĻžāϰ⧀āϰ āύāĻžāĻŽ āĻŦāĻž āĻĒāĻžāϏāĻ“ā§ŸāĻžāĻ°ā§āĻĄ āĻ…āĻ•āĻžāĻ°ā§āϝāĻ•āϰ
 check_server_details=āϏāĻžāĻ°ā§āĻ­āĻžāϰ⧇āϰ āĻŦāĻŋāĻ¸ā§āϤāĻžāϰāĻŋāϤ āĻĒāϰ⧀āĻ•ā§āώāĻž āĻ•āϰāĻž āĻšāĻšā§āϛ⧇
 check_in_server_details=āφāĻ—āϤ āϏāĻžāĻ°ā§āĻ­āĻžāϰ⧇āϰ āĻŦāĻŋāĻ¸ā§āϤāĻžāϰāĻŋāϤ āĻĒāϰ⧀āĻ•ā§āώāĻž āĻ•āϰāĻž āĻšāĻšā§āϛ⧇
 check_out_server_details=āφāĻ—āϤ āϏāĻžāĻ°ā§āĻ­āĻžāϰ⧇āϰ āĻŦāĻŋāĻ¸ā§āϤāĻžāϰāĻŋāϤ āĻĒāϰ⧀āĻ•ā§āώāĻž āĻ•āϰāĻž āĻšāĻšā§āϛ⧇
 
 error_creating_account=āĻ…ā§āϝāĻžāĻ•āĻžāωāĻ¨ā§āϟ āϤ⧈āϰāĻŋāϤ⧇ āĻ¤ā§āϰ⧁āϟāĻŋ
 incoming_server_exists=āφāĻ—āϤ āϏāĻžāĻ°ā§āĻ­āĻžāϰ āχāϤ⧋āĻŽāĻ§ā§āϝ⧇ āφāϛ⧇āĨ¤
 
-# LOCALIZATION NOTE(no_encryption): Neither SSL/TLS nor STARTTLS. Transmission of emails in cleartext over the Internet.
-no_encryption=āϕ⧋āύ⧋ āĻāύāĻ•ā§āϰāĻŋāĻĒāĻļāύ āύ⧇āχ
-ssl_tls=SSL/TLS
-starttls=STARTTLS
-
 please_enter_name=āĻ…āύ⧁āĻ—ā§āϰāĻš āĻ•āϰ⧇ āφāĻĒāύāĻžāϰ āύāĻžāĻŽ āϞāĻŋāϖ⧁āύ
 double_check_email=āĻāχ āχāĻŽā§‡āχāϞ āĻ āĻŋāĻ•āĻžāύāĻž āĻĻ⧁āχāĻŦāĻžāϰ āĻĒāϰ⧀āĻ•ā§āώāĻž āĻ•āϰāĻž āĻšāĻŦ⧇!
+
+#config result display
+# LOCALIZATION NOTE(resultUnknown): Displayed instead of resultIncoming,
+# resultOutgoing or resultUsername when we don't have a proper value.
+resultUnknown=Unknown
+# LOCALIZATION NOTE(resultIncoming):
+# %1$S will be replaced with either resultIMAP, resultPOP3 or resultSMTP.
+# %2$S will be replaced with the server hostname
+#   with possibly a port appended as ":"+port.
+#   The domain part may be made bold.
+# %3$S will be replaced with either resultNoEncryption or resultSSL or
+#    resultSTARTTLS.
+# %4$S will be replaced with either resultSSLCertWeak or resultSSLCertOK
+#    (which should normally be empty)
+# You may adjust the strings to be a real sentence.
+resultIncoming=%1$S, %2$S, %3$S%4$S
+# LOCALIZATION NOTE(resultOutgoing): see resultIncoming
+resultOutgoing=%1$S, %2$S, %3$S%4$S
+resultOutgoingExisting=Use existing outgoing SMTP server
+resultIMAP=IMAP
+resultPOP3=POP3
+resultSMTP=SMTP
+# LOCALIZATION NOTE(resultNoEncryption): Neither SSL/TLS nor STARTTLS. Transmission of emails in cleartext over the Internet.
+resultNoEncryption=No Encryption
+resultSSL=SSL
+resultSTARTTLS=STARTTLS
+# LOCALIZATION NOTE(resultSSLCertWeak): \u0020 is just a space
+resultSSLCertWeak= (Warning: Could not verify server)
+resultSSLCertOK=
+resultUsernameBoth=%1$S
+resultUsernameDifferent=Incoming: %1$S, Outgoing: %2$S
--- a/mail/chrome/messenger/activity.dtd
+++ b/mail/chrome/messenger/activity.dtd
@@ -1,33 +1,33 @@
 <!-- LOCALIZATION NOTE (window.width2, window.height): These values should be
 close to the golden ratio (1.618:1) while making sure it's wide enough for long
 file names and tall enough to hint that there are more activities in the list -->
-<!ENTITY window.width2 "485">
-<!ENTITY window.height "300">
+<!ENTITY window.width2                    "485">
+<!ENTITY window.height                    "300">
 
-<!ENTITY activity.title "āĻ•āĻžāĻ°ā§āϝāĻ•ā§āϰāĻŽ āĻŦā§āϝāĻŦāĻ¸ā§āĻĨāĻžāĻĒāĻ•">
+<!ENTITY activity.title                  "āĻ•āĻžāĻ°ā§āϝāĻ•ā§āϰāĻŽ āĻŦā§āϝāĻŦāĻ¸ā§āĻĨāĻžāĻĒāĻ•">
 
-<!ENTITY cmd.pause.label "āĻŦāĻŋāϰāϤāĻŋ (P)">
-<!ENTITY cmd.pause.accesskey "P">
-<!ENTITY cmd.resume.label "āĻĒ⧁āύāϰāĻžā§Ÿ āφāϰāĻŽā§āĻ­ (R)">
-<!ENTITY cmd.resume.accesskey "R">
-<!ENTITY cmd.cancel.label "āĻŦāĻžāϤāĻŋāϞ (C)">
-<!ENTITY cmd.cancel.accesskey "C">
-<!ENTITY cmd.undo.label "āĻĒā§‚āĻ°ā§āĻŦāĻžāĻŦāĻ¸ā§āĻĨāĻžā§Ÿ āĻĢ⧇āϰāĻžāύ⧋ (U)">
-<!ENTITY cmd.undo.accesskey "U">
-<!ENTITY cmd.recover.label "āĻĒ⧁āύāϰ⧁āĻĻā§āϧāĻžāϰ (v)">
-<!ENTITY cmd.recover.accesskey "v">
-<!ENTITY cmd.retry.label "āĻĒ⧁āύāϰāĻžā§Ÿ āĻšā§‡āĻˇā§āϟāĻž (R)">
-<!ENTITY cmd.retry.accesskey "R">
-<!ENTITY cmd.removeFromList.label "āϤāĻžāϞāĻŋāĻ•āĻž āĻĨ⧇āϕ⧇ āĻ…āĻĒāϏāĻžāϰāĻŖ (e)">
-<!ENTITY cmd.removeFromList.accesskey "e">
+<!ENTITY cmd.pause.label                  "āĻŦāĻŋāϰāϤāĻŋ (P)">
+<!ENTITY cmd.pause.accesskey              "P">
+<!ENTITY cmd.resume.label                 "āĻĒ⧁āύāϰāĻžā§Ÿ āφāϰāĻŽā§āĻ­ (R)">
+<!ENTITY cmd.resume.accesskey             "R">
+<!ENTITY cmd.cancel.label                 "āĻŦāĻžāϤāĻŋāϞ (C)">
+<!ENTITY cmd.cancel.accesskey             "C">
+<!ENTITY cmd.undo.label                   "āĻĒā§‚āĻ°ā§āĻŦāĻžāĻŦāĻ¸ā§āĻĨāĻžā§Ÿ āĻĢ⧇āϰāĻžāύ⧋ (U)">
+<!ENTITY cmd.undo.accesskey               "U">
+<!ENTITY cmd.recover.label                "āĻĒ⧁āύāϰ⧁āĻĻā§āϧāĻžāϰ (v)">
+<!ENTITY cmd.recover.accesskey            "v">
+<!ENTITY cmd.retry.label                  "āĻĒ⧁āύāϰāĻžā§Ÿ āĻšā§‡āĻˇā§āϟāĻž (R)">
+<!ENTITY cmd.retry.accesskey              "R">
+<!ENTITY cmd.removeFromList.label         "āϤāĻžāϞāĻŋāĻ•āĻž āĻĨ⧇āϕ⧇ āĻ…āĻĒāϏāĻžāϰāĻŖ (e)">
+<!ENTITY cmd.removeFromList.accesskey     "e">
 
-<!ENTITY cmd.close.commandkey "w">
-<!ENTITY cmd.close2.commandkey "j">
-<!ENTITY cmd.close2Unix.commandkey "y">
-<!ENTITY cmd.clearList.label "āϤāĻžāϞāĻŋāĻ•āĻž āĻĒāϰāĻŋāĻˇā§āĻ•āĻžāϰ (C)">
-<!ENTITY cmd.clearList.tooltip "āϤāĻžāϞāĻŋāĻ•āĻž āĻĨ⧇āϕ⧇ āϏāĻŽā§āĻĒāĻ¨ā§āύ, āĻŦāĻžāϤāĻŋāϞāĻ•ā§ƒāϤ, āĻāĻŦāĻ‚ āĻŦā§āϝāĻ°ā§āĻĨ āφāχāĻŸā§‡āĻŽāϏāĻŽā§‚āĻš āĻŽā§āϛ⧇ āĻĢ⧇āϞ⧇">
-<!ENTITY cmd.clearList.accesskey "C">
-<!ENTITY cmd.find.commandkey "f">
-<!ENTITY cmd.search.commandkey "k">
+<!ENTITY cmd.close.commandkey             "w">
+<!ENTITY cmd.close2.commandkey            "j">
+<!ENTITY cmd.close2Unix.commandkey        "y">
+<!ENTITY cmd.clearList.label              "āϤāĻžāϞāĻŋāĻ•āĻž āĻĒāϰāĻŋāĻˇā§āĻ•āĻžāϰ (C)">
+<!ENTITY cmd.clearList.tooltip            "āϤāĻžāϞāĻŋāĻ•āĻž āĻĨ⧇āϕ⧇ āϏāĻŽā§āĻĒāĻ¨ā§āύ, āĻŦāĻžāϤāĻŋāϞāĻ•ā§ƒāϤ, āĻāĻŦāĻ‚ āĻŦā§āϝāĻ°ā§āĻĨ āφāχāĻŸā§‡āĻŽāϏāĻŽā§‚āĻš āĻŽā§āϛ⧇ āĻĢ⧇āϞ⧇">
+<!ENTITY cmd.clearList.accesskey          "C">
+<!ENTITY cmd.find.commandkey              "f">
+<!ENTITY cmd.search.commandkey            "k">
 
-<!ENTITY searchBox.label "āĻ…āύ⧁āϏāĻ¨ā§āϧāĻžāύâ€Ļ">
+<!ENTITY searchBox.label                  "āĻ…āύ⧁āϏāĻ¨ā§āϧāĻžāύâ€Ļ">
--- a/mail/chrome/messenger/addressbook/abAddressBookNameDialog.dtd
+++ b/mail/chrome/messenger/addressbook/abAddressBookNameDialog.dtd
@@ -31,10 +31,10 @@
  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 ***** -->
 <!-- Labels -->
 
-<!ENTITY name.label "āĻ āĻŋāĻ•āĻžāύāĻž āĻŦāĻ‡ā§Ÿā§‡āϰ āύāĻžāĻŽ (A):">
-<!ENTITY name.accesskey "A">
+<!ENTITY name.label      "āĻ āĻŋāĻ•āĻžāύāĻž āĻŦāĻ‡ā§Ÿā§‡āϰ āύāĻžāĻŽ (A):">
+<!ENTITY name.accesskey  "A">
--- a/mail/chrome/messenger/addressbook/abCardOverlay.dtd
+++ b/mail/chrome/messenger/addressbook/abCardOverlay.dtd
@@ -30,148 +30,148 @@
  use your version of this file under the terms of the MPL, indicate your
  decision by deleting the provisions above and replace them with the notice
  and other provisions required by the GPL or the LGPL. If you do not delete
  the provisions above, a recipient may use your version of this file under
  the terms of any one of the MPL, the GPL or the LGPL.
 
  ***** END LICENSE BLOCK ***** -->
 
-<!ENTITY Contact.tab "āĻĒāϰāĻŋāϚāĻŋāϤāĻŋ">
-<!ENTITY Contact.accesskey "C">
-<!ENTITY Name.box "āύāĻžāĻŽ">
+<!ENTITY Contact.tab                     "āĻĒāϰāĻŋāϚāĻŋāϤāĻŋ">
+<!ENTITY Contact.accesskey               "C">
+<!ENTITY Name.box                        "āύāĻžāĻŽ">
 <!-- 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.
 -->
 <!-- LOCALIZATION NOTE (NameField1.id) : DONT_TRANSLATE -->
 
 
-<!ENTITY NameField1.id "FirstName">
+<!ENTITY NameField1.id                  "FirstName">
 <!-- LOCALIZATION NOTE (NameField2.id) : DONT_TRANSLATE -->
-<!ENTITY NameField2.id "LastName">
+<!ENTITY NameField2.id                  "LastName">
 <!-- LOCALIZATION NOTE (PhoneticField1.id) : DONT_TRANSLATE -->
-<!ENTITY PhoneticField1.id "PhoneticFirstName">
+<!ENTITY PhoneticField1.id              "PhoneticFirstName">
 <!-- LOCALIZATION NOTE (PhoneticField2.id) : DONT_TRANSLATE -->
-<!ENTITY PhoneticField2.id "PhoneticLastName">
+<!ENTITY PhoneticField2.id              "PhoneticLastName">
 
-<!ENTITY NameField1.label "āύāĻžāĻŽā§‡āϰ āĻĒā§āϰāĻĨāĻŽāĻžāĻ‚āĻļ (F):">
-<!ENTITY NameField1.accesskey "F">
-<!ENTITY NameField2.label "āύāĻžāĻŽā§‡āϰ āĻļ⧇āώāĻžāĻ‚āĻļ (L):">
-<!ENTITY NameField2.accesskey "L">
-<!ENTITY PhoneticField1.label "āĻĢāύ⧇āϟāĻŋāĻ•:">
-<!ENTITY PhoneticField2.label "āĻĢāύ⧇āϟāĻŋāĻ•:">
-<!ENTITY DisplayName.label "āĻĒā§āϰāĻĻāĻ°ā§āĻļāύ (D):">
-<!ENTITY DisplayName.accesskey "D">
-<!ENTITY preferDisplayName.label "āĻŦāĻžāĻ°ā§āϤāĻžāϰ āĻļā§€āĻ°ā§āώāϚāϰāϪ⧇ āύāĻžāĻŽ āĻĒā§āϰāĻĻāĻ°ā§āĻļāύ āϏāĻ°ā§āĻŦāĻĻāĻž āĻĒāĻ›āĻ¨ā§āĻĻ āĻ•āϰāĻž āĻšā§Ÿ">
-<!ENTITY preferDisplayName.accesskey "y">
-<!ENTITY NickName.label "āĻĄāĻžāĻ•āύāĻžāĻŽ (N):">
-<!ENTITY NickName.accesskey "N">
+<!ENTITY NameField1.label               "āύāĻžāĻŽā§‡āϰ āĻĒā§āϰāĻĨāĻŽāĻžāĻ‚āĻļ (F):">
+<!ENTITY NameField1.accesskey           "F">
+<!ENTITY NameField2.label               "āύāĻžāĻŽā§‡āϰ āĻļ⧇āώāĻžāĻ‚āĻļ (L):">
+<!ENTITY NameField2.accesskey           "L">
+<!ENTITY PhoneticField1.label           "āĻĢāύ⧇āϟāĻŋāĻ•:">
+<!ENTITY PhoneticField2.label           "āĻĢāύ⧇āϟāĻŋāĻ•:">
+<!ENTITY DisplayName.label              "āĻĒā§āϰāĻĻāĻ°ā§āĻļāύ (D):">
+<!ENTITY DisplayName.accesskey          "D">
+<!ENTITY preferDisplayName.label        "āĻŦāĻžāĻ°ā§āϤāĻžāϰ āĻļā§€āĻ°ā§āώāϚāϰāϪ⧇ āύāĻžāĻŽ āĻĒā§āϰāĻĻāĻ°ā§āĻļāύ āϏāĻ°ā§āĻŦāĻĻāĻž āĻĒāĻ›āĻ¨ā§āĻĻ āĻ•āϰāĻž āĻšā§Ÿ">
+<!ENTITY preferDisplayName.accesskey    "y">
+<!ENTITY NickName.label                 "āĻĄāĻžāĻ•āύāĻžāĻŽ (N):">
+<!ENTITY NickName.accesskey             "N">
 
-<!ENTITY PrimaryEmail.label "āχ-āĻŽā§‡āχāϞ (E):">
-<!ENTITY PrimaryEmail.accesskey "E">
-<!ENTITY SecondEmail.label "āĻ…āϤāĻŋāϰāĻŋāĻ•ā§āϤ āχ-āĻŽā§‡āχāϞ (i):">
-<!ENTITY SecondEmail.accesskey "i">
-<!ENTITY PreferMailFormat.label "āĻĒāĻ›āĻ¨ā§āĻĻāϏāχ āĻŦāĻžāĻ°ā§āϤāĻžāϰ āĻŦāĻŋāĻ¨ā§āϝāĻžāϏ (v):">
-<!ENTITY PreferMailFormat.accesskey "v">
-<!ENTITY PlainText.label "āϏāĻžāϧāĻžāϰāύ āĻŸā§‡āĻ•ā§āϏāϟ">
-<!ENTITY HTML.label "HTML">
-<!ENTITY Unknown.label "āĻ…āϜāĻžāύāĻž">
-<!ENTITY ScreenName.label "āĻĒāĻ°ā§āĻĻāĻžāϰ āύāĻžāĻŽ (S):">
-<!ENTITY ScreenName.accesskey "S">
+<!ENTITY PrimaryEmail.label             "āχ-āĻŽā§‡āχāϞ (E):">
+<!ENTITY PrimaryEmail.accesskey         "E">
+<!ENTITY SecondEmail.label              "āĻ…āϤāĻŋāϰāĻŋāĻ•ā§āϤ āχ-āĻŽā§‡āχāϞ (i):">
+<!ENTITY SecondEmail.accesskey          "i">
+<!ENTITY PreferMailFormat.label         "āĻĒāĻ›āĻ¨ā§āĻĻāϏāχ āĻŦāĻžāĻ°ā§āϤāĻžāϰ āĻŦāĻŋāĻ¨ā§āϝāĻžāϏ (v):">
+<!ENTITY PreferMailFormat.accesskey     "v">
+<!ENTITY PlainText.label                "āϏāĻžāϧāĻžāϰāύ āĻŸā§‡āĻ•ā§āϏāϟ">
+<!ENTITY HTML.label                     "HTML">
+<!ENTITY Unknown.label                  "āĻ…āϜāĻžāύāĻž">
+<!ENTITY ScreenName.label               "āĻĒāĻ°ā§āĻĻāĻžāϰ āύāĻžāĻŽ (S):">
+<!ENTITY ScreenName.accesskey           "S">
 
-<!ENTITY allowRemoteContent1.label "āĻĻā§‚āϰāĻŦāĻ°ā§āϤ⧀ āĻŦāĻŋāώ⧟āĻŦāĻ¸ā§āϤ⧁ āĻ…āύ⧁āĻŽā§‹āĻĻāύ āĻ•āϰāĻž āĻšāĻŦ⧇ (r)āĨ¤">
-<!ENTITY allowRemoteContent1.accesskey "r">
-<!ENTITY allowRemoteContent1.tooltip "HTML āĻŦāĻžāĻ°ā§āϤāĻžā§Ÿ, āĻĻā§‚āϰāĻŦāĻ°ā§āϤ⧀ āĻ‰ā§ŽāϏ āĻšāϤ⧇ āĻŦāĻŋāώ⧟āĻŦāĻ¸ā§āϤ⧁ 
+<!ENTITY allowRemoteContent1.label      "āĻĻā§‚āϰāĻŦāĻ°ā§āϤ⧀ āĻŦāĻŋāώ⧟āĻŦāĻ¸ā§āϤ⧁ āĻ…āύ⧁āĻŽā§‹āĻĻāύ āĻ•āϰāĻž āĻšāĻŦ⧇ (r)āĨ¤">
+<!ENTITY allowRemoteContent1.accesskey  "r">
+<!ENTITY allowRemoteContent1.tooltip    "HTML āĻŦāĻžāĻ°ā§āϤāĻžā§Ÿ, āĻĻā§‚āϰāĻŦāĻ°ā§āϤ⧀ āĻ‰ā§ŽāϏ āĻšāϤ⧇ āĻŦāĻŋāώ⧟āĻŦāĻ¸ā§āϤ⧁ 
 āϏāĻ‚āϝ⧁āĻ•ā§āϤ āĻ•āϰāĻž āϏāĻŽā§āĻ­āĻŦāĨ¤ āĻāχ āϧāϰāύ⧇āϰ āĻŦāĻžāĻ°ā§āϤāĻž āĻ–ā§‹āϞāĻž āĻšāϞ⧇, 
 āĻāχ āĻŦāĻšāĻŋāσāĻ¸ā§āĻĨ āĻ‰ā§ŽāϏ⧇āϰ āϏāĻ‚āϝ⧋āĻ— āϖ⧁āϞ⧇ āϝāĻžāĻŦ⧇āĨ¤ āĻāϟāĻž āĻšā§ŸāϤ⧋ āĻŦāĻžāĻ°ā§āϤāĻž āĻĒāĻ āύ 
 āĻ…āύ⧁āϏāϰāĻŖ āĻ•āϰāϤ⧇ āĻ…āύ⧁āĻŽā§‹āĻĻāύ āĻ•āϰāĻŦ⧇āĨ¤ āĻāχ āĻŦāĻžāĻ•ā§āϏāϟāĻŋ āύāĻŋāĻ°ā§āĻŦāĻžāϚāύ āĻ•āϰāϞ⧇, āĻāχ āϧāϰāύ⧇āϰ āĻŦāĻšāĻŋāσāĻ¸ā§āĻĨ āϏāĻ¨ā§āύāĻŋāĻŦ⧇āĻļāĻŋāϤ āĻŦāĻŋāώ⧟āĻŦāĻ¸ā§āϤ⧁ 
 āĻāχ āĻĒāϰāĻŋāϚāĻŋāϤāĻŋ āĻšāϤ⧇ HTML āĻŦāĻžāĻ°ā§āϤāĻžā§Ÿ āφāύāĻž āϝāĻžāĻŦ⧇āĨ¤">
 
-<!ENTITY WorkPhone.label "āĻ…āĻĢāĻŋāϏ (k):">
-<!ENTITY WorkPhone.accesskey "k">
-<!ENTITY HomePhone.label "āĻŦāĻžāϏāĻž (m):">
-<!ENTITY HomePhone.accesskey "m">
-<!ENTITY FaxNumber.label "āĻĢā§āϝāĻžāĻ•ā§āϏ (x):">
-<!ENTITY FaxNumber.accesskey "x">
-<!ENTITY PagerNumber.label "āĻĒ⧇āϜāĻžāϰ (g):">
-<!ENTITY PagerNumber.accesskey "g">
-<!ENTITY CellularNumber.label "āĻŽā§‹āĻŦāĻžāχāϞ (b):">
-<!ENTITY CellularNumber.accesskey "b">
+<!ENTITY WorkPhone.label                "āĻ…āĻĢāĻŋāϏ (k):">
+<!ENTITY WorkPhone.accesskey            "k">
+<!ENTITY HomePhone.label                "āĻŦāĻžāϏāĻž (m):">
+<!ENTITY HomePhone.accesskey            "m">
+<!ENTITY FaxNumber.label                "āĻĢā§āϝāĻžāĻ•ā§āϏ (x):">
+<!ENTITY FaxNumber.accesskey            "x">
+<!ENTITY PagerNumber.label              "āĻĒ⧇āϜāĻžāϰ (g):">
+<!ENTITY PagerNumber.accesskey          "g">
+<!ENTITY CellularNumber.label           "āĻŽā§‹āĻŦāĻžāχāϞ (b):">
+<!ENTITY CellularNumber.accesskey       "b">
 
-<!ENTITY Home.tab "āĻŦā§āϝāĻ•ā§āϤāĻŋāĻ—āϤ">
-<!ENTITY Home.accesskey "P">
-<!ENTITY HomeAddress.label "āĻ āĻŋāĻ•āĻžāύāĻž (A):">
-<!ENTITY HomeAddress.accesskey "A">
-<!ENTITY HomeAddress2.label "">
-<!ENTITY HomeAddress2.accesskey "">
-<!ENTITY HomeCity.label "āĻļāĻšāϰ (y):">
-<!ENTITY HomeCity.accesskey "y">
-<!ENTITY HomeState.label "āϰāĻžāĻˇā§āĻŸā§āϰ/āĻĒā§āϰāĻĻ⧇āĻļ (S):">
-<!ENTITY HomeState.accesskey "S">
-<!ENTITY HomeZipCode.label "āϜāĻŋāĻĒ/āĻĒā§‹āĻ¸ā§āϟāĻžāϞ āϕ⧋āĻĄ (Z):">
-<!ENTITY HomeZipCode.accesskey "Z">
-<!ENTITY HomeCountry.label "āĻĻ⧇āĻļ (u):">
-<!ENTITY HomeCountry.accesskey "u">
-<!ENTITY HomeWebPage.label "āĻ“ā§Ÿā§‡āĻŦ āĻĒ⧇āϜ (e):">
-<!ENTITY HomeWebPage.accesskey "e">
-<!ENTITY Birthday.label "āϜāĻ¨ā§āĻŽāĻĻāĻŋāύ (B):">
-<!ENTITY Birthday.accesskey "B">
-<!ENTITY In.label "">
-<!ENTITY Year.placeholder "āĻŦāĻ›āϰ">
-<!ENTITY Or.value "āĻŦāĻž">
-<!ENTITY Age.placeholder "āĻŦ⧟āϏ">
-<!ENTITY YearsOld.label "">
+<!ENTITY Home.tab                       "āĻŦā§āϝāĻ•ā§āϤāĻŋāĻ—āϤ">
+<!ENTITY Home.accesskey                 "P">
+<!ENTITY HomeAddress.label              "āĻ āĻŋāĻ•āĻžāύāĻž (A):">
+<!ENTITY HomeAddress.accesskey          "A">
+<!ENTITY HomeAddress2.label             "">
+<!ENTITY HomeAddress2.accesskey         "">
+<!ENTITY HomeCity.label                 "āĻļāĻšāϰ (y):">
+<!ENTITY HomeCity.accesskey             "y">
+<!ENTITY HomeState.label                "āϰāĻžāĻˇā§āĻŸā§āϰ/āĻĒā§āϰāĻĻ⧇āĻļ (S):">
+<!ENTITY HomeState.accesskey            "S">
+<!ENTITY HomeZipCode.label              "āϜāĻŋāĻĒ/āĻĒā§‹āĻ¸ā§āϟāĻžāϞ āϕ⧋āĻĄ (Z):">
+<!ENTITY HomeZipCode.accesskey          "Z">
+<!ENTITY HomeCountry.label              "āĻĻ⧇āĻļ (u):">
+<!ENTITY HomeCountry.accesskey          "u">
+<!ENTITY HomeWebPage.label              "āĻ“ā§Ÿā§‡āĻŦ āĻĒ⧇āϜ (e):">
+<!ENTITY HomeWebPage.accesskey          "e">
+<!ENTITY Birthday.label                 "āϜāĻ¨ā§āĻŽāĻĻāĻŋāύ (B):">
+<!ENTITY Birthday.accesskey             "B">
+<!ENTITY In.label                       "">
+<!ENTITY Year.placeholder               "āĻŦāĻ›āϰ">
+<!ENTITY Or.value                       "āĻŦāĻž">
+<!ENTITY Age.placeholder                "āĻŦ⧟āϏ">
+<!ENTITY YearsOld.label                 "">
 
-<!ENTITY Work.tab "āĻ…āĻĢāĻŋāϏ">
-<!ENTITY Work.accesskey "W">
-<!ENTITY JobTitle.label "āĻļāĻŋāϰ⧋āύāĻžāĻŽ (i):">
-<!ENTITY JobTitle.accesskey "i">
-<!ENTITY Department.label "āĻŦāĻŋāĻ­āĻžāĻ— (m):">
-<!ENTITY Department.accesskey "m">
-<!ENTITY Company.label "āĻĒā§āϰāϤāĻŋāĻˇā§āĻ āĻžāύ (O):">
-<!ENTITY Company.accesskey "O">
-<!ENTITY WorkAddress.label "āĻ āĻŋāĻ•āĻžāύāĻž (A):">
-<!ENTITY WorkAddress.accesskey "A">
-<!ENTITY WorkAddress2.label "">
-<!ENTITY WorkAddress2.accesskey "">
-<!ENTITY WorkCity.label "āĻļāĻšāϰ (y):">
-<!ENTITY WorkCity.accesskey "y">
-<!ENTITY WorkState.label "āϰāĻžāĻˇā§āĻŸā§āϰ/āĻĒā§āϰāĻĻ⧇āĻļ (S):">
-<!ENTITY WorkState.accesskey "S">
-<!ENTITY WorkZipCode.label "āϜāĻŋāĻĒ/āĻĒā§‹āĻ¸ā§āϟāĻžāϞ āϕ⧋āĻĄ (Z):">
-<!ENTITY WorkZipCode.accesskey "Z">
-<!ENTITY WorkCountry.label "āĻĻ⧇āĻļ (u):">
-<!ENTITY WorkCountry.accesskey "u">
-<!ENTITY WorkWebPage.label "āĻ“ā§Ÿā§‡āĻŦ āĻĒ⧇āϜ (e):">
-<!ENTITY WorkWebPage.accesskey "e">
+<!ENTITY Work.tab                       "āĻ…āĻĢāĻŋāϏ">
+<!ENTITY Work.accesskey                 "W">
+<!ENTITY JobTitle.label                 "āĻļāĻŋāϰ⧋āύāĻžāĻŽ (i):">
+<!ENTITY JobTitle.accesskey             "i">
+<!ENTITY Department.label               "āĻŦāĻŋāĻ­āĻžāĻ— (m):">
+<!ENTITY Department.accesskey           "m">
+<!ENTITY Company.label                  "āĻĒā§āϰāϤāĻŋāĻˇā§āĻ āĻžāύ (O):">
+<!ENTITY Company.accesskey              "O">
+<!ENTITY WorkAddress.label              "āĻ āĻŋāĻ•āĻžāύāĻž (A):">
+<!ENTITY WorkAddress.accesskey          "A">
+<!ENTITY WorkAddress2.label             "">
+<!ENTITY WorkAddress2.accesskey         "">
+<!ENTITY WorkCity.label                 "āĻļāĻšāϰ (y):">
+<!ENTITY WorkCity.accesskey             "y">
+<!ENTITY WorkState.label                "āϰāĻžāĻˇā§āĻŸā§āϰ/āĻĒā§āϰāĻĻ⧇āĻļ (S):">
+<!ENTITY WorkState.accesskey            "S">
+<!ENTITY WorkZipCode.label              "āϜāĻŋāĻĒ/āĻĒā§‹āĻ¸ā§āϟāĻžāϞ āϕ⧋āĻĄ (Z):">
+<!ENTITY WorkZipCode.accesskey          "Z">
+<!ENTITY WorkCountry.label              "āĻĻ⧇āĻļ (u):">
+<!ENTITY WorkCountry.accesskey          "u">
+<!ENTITY WorkWebPage.label              "āĻ“ā§Ÿā§‡āĻŦ āĻĒ⧇āϜ (e):">
+<!ENTITY WorkWebPage.accesskey          "e">
 
-<!ENTITY Other.tab "āĻ…āĻ¨ā§āϝāĻžāĻ¨ā§āϝ">
-<!ENTITY Other.accesskey "h">
-<!ENTITY Custom1.label "āĻ¸ā§āĻŦāύāĻŋāĻ°ā§āĻŦāĻžāϚāύ ā§§ (1):">
-<!ENTITY Custom1.accesskey "1">
-<!ENTITY Custom2.label "āĻ¸ā§āĻŦāύāĻŋāĻ°ā§āĻŦāĻžāϚāύ ⧍ (2):">
-<!ENTITY Custom2.accesskey "2">
-<!ENTITY Custom3.label "āĻ¸ā§āĻŦāύāĻŋāĻ°ā§āĻŦāĻžāϚāύ ā§Š (3)">
-<!ENTITY Custom3.accesskey "3">
-<!ENTITY Custom4.label "āĻ¸ā§āĻŦāύāĻŋāĻ°ā§āĻŦāĻžāϚāύ ā§Ē (4):">
-<!ENTITY Custom4.accesskey "4">
-<!ENTITY Notes.label "āύ⧋āϟ (N):">
-<!ENTITY Notes.accesskey "N">
+<!ENTITY Other.tab                      "āĻ…āĻ¨ā§āϝāĻžāĻ¨ā§āϝ">
+<!ENTITY Other.accesskey                "h">
+<!ENTITY Custom1.label                  "āĻ¸ā§āĻŦāύāĻŋāĻ°ā§āĻŦāĻžāϚāύ ā§§ (1):">
+<!ENTITY Custom1.accesskey              "1">
+<!ENTITY Custom2.label                  "āĻ¸ā§āĻŦāύāĻŋāĻ°ā§āĻŦāĻžāϚāύ ⧍ (2):">
+<!ENTITY Custom2.accesskey              "2">
+<!ENTITY Custom3.label                  "āĻ¸ā§āĻŦāύāĻŋāĻ°ā§āĻŦāĻžāϚāύ ā§Š (3)">
+<!ENTITY Custom3.accesskey              "3">
+<!ENTITY Custom4.label                  "āĻ¸ā§āĻŦāύāĻŋāĻ°ā§āĻŦāĻžāϚāύ ā§Ē (4):">
+<!ENTITY Custom4.accesskey              "4">
+<!ENTITY Notes.label                    "āύ⧋āϟ (N):">
+<!ENTITY Notes.accesskey                "N">
 
-<!ENTITY Photo.tab "āĻ›āĻŦāĻŋ">
-<!ENTITY Photo.accesskey "o">
-<!ENTITY PhotoDesc.label "āύāĻŋāĻšā§‡āϰ āϝ⧇āϕ⧋āύ⧋ āĻāĻ•āϟāĻŋ āĻŦ⧇āϛ⧇ āύāĻŋāύ:">
-<!ENTITY GenericPhoto.label "āϏāĻžāϧāĻžāϰāĻŖ āĻ›āĻŦāĻŋ (G)">
-<!ENTITY GenericPhoto.accesskey "G">
-<!ENTITY DefaultPhoto.label "āĻĄāĻŋāĻĢāĻ˛ā§āϟ">
-<!ENTITY PhotoFile.label "āĻāχ āĻ•āĻŽā§āĻĒāĻŋāωāϟāĻžāϰ⧇ (n)">
-<!ENTITY PhotoFile.accesskey "n">
-<!ENTITY BrowsePhoto.label "āĻŦā§āϰāĻžāωāϜ (r)">
-<!ENTITY BrowsePhoto.accesskey "r">
-<!ENTITY PhotoURL.label "āĻ“ā§Ÿā§‡āĻŦ⧇ (b)">
-<!ENTITY PhotoURL.accesskey "b">
-<!ENTITY PhotoURL.placeholder "āĻ›āĻŦāĻŋāϰ āĻ“ā§Ÿā§‡āĻŦ āĻ āĻŋāĻ•āĻžāύāĻžāϟāĻŋ āĻĒā§āϰāϤāĻŋāϞ⧇āĻĒāύ āĻ…āĻĨāĻŦāĻž āϟāĻžāχāĻĒ">
-<!ENTITY UpdatePhoto.label "āĻšāĻžāϞāύāĻžāĻ—āĻžāĻĻ (U)">
-<!ENTITY UpdatePhoto.accesskey "U">
+<!ENTITY Photo.tab                      "āĻ›āĻŦāĻŋ">
+<!ENTITY Photo.accesskey                "o">
+<!ENTITY PhotoDesc.label                "āύāĻŋāĻšā§‡āϰ āϝ⧇āϕ⧋āύ⧋ āĻāĻ•āϟāĻŋ āĻŦ⧇āϛ⧇ āύāĻŋāύ:">
+<!ENTITY GenericPhoto.label             "āϏāĻžāϧāĻžāϰāĻŖ āĻ›āĻŦāĻŋ (G)">
+<!ENTITY GenericPhoto.accesskey         "G">
+<!ENTITY DefaultPhoto.label             "āĻĄāĻŋāĻĢāĻ˛ā§āϟ">
+<!ENTITY PhotoFile.label                "āĻāχ āĻ•āĻŽā§āĻĒāĻŋāωāϟāĻžāϰ⧇ (n)">
+<!ENTITY PhotoFile.accesskey            "n">
+<!ENTITY BrowsePhoto.label              "āĻŦā§āϰāĻžāωāϜ (r)">
+<!ENTITY BrowsePhoto.accesskey          "r">
+<!ENTITY PhotoURL.label                 "āĻ“ā§Ÿā§‡āĻŦ⧇ (b)">
+<!ENTITY PhotoURL.accesskey             "b">
+<!ENTITY PhotoURL.placeholder           "āĻ›āĻŦāĻŋāϰ āĻ“ā§Ÿā§‡āĻŦ āĻ āĻŋāĻ•āĻžāύāĻžāϟāĻŋ āĻĒā§āϰāϤāĻŋāϞ⧇āĻĒāύ āĻ…āĻĨāĻŦāĻž āϟāĻžāχāĻĒ">
+<!ENTITY UpdatePhoto.label              "āĻšāĻžāϞāύāĻžāĻ—āĻžāĻĻ (U)">
+<!ENTITY UpdatePhoto.accesskey          "U">
--- a/mail/chrome/messenger/addressbook/abCardViewOverlay.dtd
+++ b/mail/chrome/messenger/addressbook/abCardViewOverlay.dtd
@@ -31,20 +31,20 @@
  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 ***** -->
 <!-- Box Headings -->
 
-<!ENTITY contact.heading "āĻĒāϰāĻŋāϚāĻŋāϤāĻŋ">
-<!ENTITY home.heading "āĻŦāĻžāϏāĻž">
-<!ENTITY other.heading "āĻ…āĻ¨ā§āϝāĻžāĻ¨ā§āϝ">
-<!ENTITY phone.heading "āĻĢā§‹āύ">
-<!ENTITY work.heading "āĻ…āĻĢāĻŋāϏ">
+<!ENTITY contact.heading             "āĻĒāϰāĻŋāϚāĻŋāϤāĻŋ">
+<!ENTITY home.heading                "āĻŦāĻžāϏāĻž">
+<!ENTITY other.heading               "āĻ…āĻ¨ā§āϝāĻžāĻ¨ā§āϝ">
+<!ENTITY phone.heading               "āĻĢā§‹āύ">
+<!ENTITY work.heading                "āĻ…āĻĢāĻŋāϏ">
 <!-- Special Box Headings, for mailing lists -->
-<!ENTITY description.heading "āĻŦāĻŋāĻŦāϰāĻŖ">
-<!ENTITY addresses.heading "āĻ āĻŋāĻ•āĻžāύāĻž">
+<!ENTITY description.heading         "āĻŦāĻŋāĻŦāϰāĻŖ">
+<!ENTITY addresses.heading           "āĻ āĻŋāĻ•āĻžāύāĻž">
 <!-- For Map It! -->
-<!ENTITY mapItButton.label "āĻŽāĻžāύāϚāĻŋāĻ¤ā§āϰ āĻĻ⧇āϖ⧁āύ">
-<!ENTITY mapIt.tooltip "āĻ“ā§Ÿā§‡āĻŦ āĻĨ⧇āϕ⧇ āĻāχ āĻ āĻŋāĻ•āĻžāύāĻžāϰ āĻŽāĻžāύāϚāĻŋāĻ¤ā§āϰ āĻĒā§āϰāĻĻāĻ°ā§āĻļāύ āĻ•āϰāĻž āĻšāĻŦ⧇">
+<!ENTITY mapItButton.label           "āĻŽāĻžāύāϚāĻŋāĻ¤ā§āϰ āĻĻ⧇āϖ⧁āύ">
+<!ENTITY mapIt.tooltip               "āĻ“ā§Ÿā§‡āĻŦ āĻĨ⧇āϕ⧇ āĻāχ āĻ āĻŋāĻ•āĻžāύāĻžāϰ āĻŽāĻžāύāϚāĻŋāĻ¤ā§āϰ āĻĒā§āϰāĻĻāĻ°ā§āĻļāύ āĻ•āϰāĻž āĻšāĻŦ⧇">
 
--- a/mail/chrome/messenger/addressbook/abContactsPanel.dtd
+++ b/mail/chrome/messenger/addressbook/abContactsPanel.dtd
@@ -1,18 +1,18 @@
-<!ENTITY addressbookPicker.label "āĻ āĻŋāĻ•āĻžāύāĻž āĻŦāχ (k):">
-<!ENTITY addressbookPicker.accesskey "k">
-<!ENTITY searchInput.label "āϝāĻžāϰ āϜāĻ¨ā§āϝ āĻ…āύ⧁āϏāĻ¨ā§āϧāĻžāύ (o):">
-<!ENTITY searchInput.accesskey "o">
-<!ENTITY SearchNameOrEmail.label "āύāĻžāĻŽ āĻŦāĻž āχ-āĻŽā§‡āχāϞ">
+<!ENTITY addressbookPicker.label            "āĻ āĻŋāĻ•āĻžāύāĻž āĻŦāχ (k):">
+<!ENTITY addressbookPicker.accesskey        "k">
+<!ENTITY searchInput.label                  "āϝāĻžāϰ āϜāĻ¨ā§āϝ āĻ…āύ⧁āϏāĻ¨ā§āϧāĻžāύ (o):">
+<!ENTITY searchInput.accesskey              "o">
+<!ENTITY SearchNameOrEmail.label            "āύāĻžāĻŽ āĻŦāĻž āχ-āĻŽā§‡āχāϞ">
 
-<!ENTITY deleteAddrBookCard.label "āĻŽā§āϛ⧇ āĻĢ⧇āϞ⧁āύ">
-<!ENTITY addrBookCardProperties.label "āĻŦ⧈āĻļāĻŋāĻˇā§āĻŸā§āϝ">
-<!ENTITY addtoToFieldMenu.label "āĻĒā§āϰāĻžāĻĒāĻ• āĻ•ā§āώ⧇āĻ¤ā§āϰ⧇ āϝ⧋āĻ— āĻ•āϰ⧁āύ">
-<!ENTITY addtoCcFieldMenu.label "Cc āĻ•ā§āώ⧇āĻ¤ā§āϰ⧇ āϝ⧋āĻ— āĻ•āϰ⧁āύ">
-<!ENTITY addtoBccFieldMenu.label "Bcc āĻ•ā§āώ⧇āĻ¤ā§āϰ⧇ āϝ⧋āĻ— āĻ•āϰ⧁āύ">
+<!ENTITY deleteAddrBookCard.label           "āĻŽā§āϛ⧇ āĻĢ⧇āϞ⧁āύ">
+<!ENTITY addrBookCardProperties.label       "āĻŦ⧈āĻļāĻŋāĻˇā§āĻŸā§āϝ">
+<!ENTITY addtoToFieldMenu.label             "āĻĒā§āϰāĻžāĻĒāĻ• āĻ•ā§āώ⧇āĻ¤ā§āϰ⧇ āϝ⧋āĻ— āĻ•āϰ⧁āύ">
+<!ENTITY addtoCcFieldMenu.label             "Cc āĻ•ā§āώ⧇āĻ¤ā§āϰ⧇ āϝ⧋āĻ— āĻ•āϰ⧁āύ">
+<!ENTITY addtoBccFieldMenu.label            "Bcc āĻ•ā§āώ⧇āĻ¤ā§āϰ⧇ āϝ⧋āĻ— āĻ•āϰ⧁āύ">
 
-<!ENTITY toButton.label "āĻĒā§āϰāĻžāĻĒāϕ⧇ āϝ⧋āĻ— āĻ•āϰāĻž āĻšāĻŦ⧇ (A):">
-<!ENTITY toButton.accesskey "A">
-<!ENTITY ccButton.label "Cc-āϤ⧇ āϝ⧋āĻ— āĻ•āϰāĻž āĻšāĻŦ⧇ (d):">
-<!ENTITY ccButton.accesskey "d">
-<!ENTITY bccButton.label "Bcc-āϤ⧇ āϝ⧋āĻ— āĻ•āϰāĻž āĻšāĻŦ⧇ (B):">
-<!ENTITY bccButton.accesskey "B">
+<!ENTITY toButton.label                     "āĻĒā§āϰāĻžāĻĒāϕ⧇ āϝ⧋āĻ— āĻ•āϰāĻž āĻšāĻŦ⧇ (A):">
+<!ENTITY toButton.accesskey                 "A">
+<!ENTITY ccButton.label                     "Cc-āϤ⧇ āϝ⧋āĻ— āĻ•āϰāĻž āĻšāĻŦ⧇ (d):">
+<!ENTITY ccButton.accesskey                 "d">
+<!ENTITY bccButton.label                    "Bcc-āϤ⧇ āϝ⧋āĻ— āĻ•āϰāĻž āĻšāĻŦ⧇ (B):">
+<!ENTITY bccButton.accesskey                "B">
--- a/mail/chrome/messenger/addressbook/abDirTreeOverlay.dtd
+++ b/mail/chrome/messenger/addressbook/abDirTreeOverlay.dtd
@@ -29,9 +29,9 @@
  under the terms of either the GPL or the LGPL, and not to allow others to
  use your version of this file under the terms of the MPL, indicate your
  decision by deleting the provisions above and replace them with the notice
  and other provisions required by the GPL or the LGPL. If you do not delete
  the provisions above, a recipient may use your version of this file under
  the terms of any one of the MPL, the GPL or the LGPL.
 
  ***** END LICENSE BLOCK ***** -->
-<!ENTITY dirTreeHeader.label "āĻ āĻŋāĻ•āĻžāύāĻž āĻŦāχ">
+<!ENTITY dirTreeHeader.label               "āĻ āĻŋāĻ•āĻžāύāĻž āĻŦāχ">
--- a/mail/chrome/messenger/addressbook/abMailListDialog.dtd
+++ b/mail/chrome/messenger/addressbook/abMailListDialog.dtd
@@ -32,26 +32,26 @@
  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 ***** -->
 <!-- Title -->
 
-<!ENTITY mailListWindow.title "āĻŽā§‡āχāϞ⧇āϰ āϤāĻžāϞāĻŋāĻ•āĻž">
+&l