Bug 709921 - (1/2) Clean up unused localization files [r=mfinkle]
authorMatt Brubeck <mbrubeck@mozilla.com>
Tue, 20 Dec 2011 08:33:22 -0800
changeset 83112 05720c79f740e7bfbfbf8e14aedd73afd0e64010
parent 83111 6af20fb62fb77be725792704028d64edeb7aa453
child 83113 c7101dec8deb827a2c91eafe3ba2fafd506fc8c9
push id21731
push usermbrubeck@mozilla.com
push dateTue, 20 Dec 2011 16:34:58 +0000
treeherdermozilla-central@c7101dec8deb [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmfinkle
bugs709921
milestone11.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 709921 - (1/2) Clean up unused localization files [r=mfinkle]
mobile/android/chrome/content/aboutHome.xhtml
mobile/android/chrome/content/bindings.xml
mobile/android/chrome/content/bindings/console.xml
mobile/android/chrome/content/browser.css
mobile/android/chrome/jar.mn
mobile/android/locales/en-US/chrome/aboutHome.dtd
mobile/android/locales/en-US/chrome/browser.dtd
mobile/android/locales/en-US/chrome/browser.properties
mobile/android/locales/en-US/chrome/preferences.dtd
mobile/android/locales/jar.mn
--- a/mobile/android/chrome/content/aboutHome.xhtml
+++ b/mobile/android/chrome/content/aboutHome.xhtml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
   "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd" [
 <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" >
 %brandDTD;
-<!ENTITY % preferenceDTD SYSTEM "chrome://browser/locale/preferences.dtd" >
-%preferenceDTD;
+<!ENTITY % aboutHomeDTD SYSTEM "chrome://browser/locale/aboutHome.dtd" >
+%aboutHomeDTD;
 ]>
 
 <!-- ***** BEGIN LICENSE BLOCK *****
    - Version: MPL 1.1/GPL 2.0/LGPL 2.1
    -
    - The contents of this file are subject to the Mozilla Public License Version
    - 1.1 (the "License"); you may not use this file except in compliance with
    - the License. You may obtain a copy of the License at
--- a/mobile/android/chrome/content/bindings.xml
+++ b/mobile/android/chrome/content/bindings.xml
@@ -1,15 +1,10 @@
 <?xml version="1.0"?>
 
-<!DOCTYPE bindings [
-<!ENTITY % browserDTD SYSTEM "chrome://browser/locale/browser.dtd">
-%browserDTD;
-]>
-
 <bindings
     xmlns="http://www.mozilla.org/xbl"
     xmlns:xbl="http://www.mozilla.org/xbl"
     xmlns:svg="http://www.w3.org/2000/svg"
     xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
   <binding id="richlistbox-batch" extends="chrome://global/content/bindings/richlistbox.xml#richlistbox">
     <handlers>
deleted file mode 100644
--- a/mobile/android/chrome/content/bindings/console.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE bindings [
-<!ENTITY % browserDTD SYSTEM "chrome://browser/locale/browser.dtd">
-%browserDTD;
-]>
-
-<bindings
-    xmlns="http://www.mozilla.org/xbl"
-    xmlns:xbl="http://www.mozilla.org/xbl"
-    xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-  <binding id="error" extends="chrome://browser/content/bindings.xml#richlistitem">
-    <content orient="vertical">
-      <xul:hbox class="console-row-internal-box" flex="1">
-        <xul:vbox class="console-row-content" flex="1">
-          <xul:hbox class="console-row-msg" align="start">
-            <xul:label class="label title" xbl:inherits="value=typetext"/>
-            <xul:description class="console-error-msg title" xbl:inherits="xbl:text=msg" flex="1"/>
-          </xul:hbox>
-          
-          <xul:hbox class="console-row-file" xbl:inherits="hidden=hideSource">
-            <xul:label class="label title" value="&consoleErrFile.label;"/>
-            <xul:label class="title" xbl:inherits="value=href" crop="right"/>
-            <xul:spacer flex="1"/>
-            <xul:hbox class="lineNumberRow" xbl:inherits="line">
-              <xul:label class="label title" value="&consoleErrLine.label;"/>
-              <xul:label class="label title" xbl:inherits="value=line"/>
-            </xul:hbox>
-          </xul:hbox>
-          
-          <xul:vbox class="console-row-code" xbl:inherits="hidden=hideCode">
-            <xul:label class="monospace console-code" xbl:inherits="value=code" crop="end"/>
-            <xul:hbox xbl:inherits="hidden=hideCaret">
-              <xul:label class="monospace console-dots title" xbl:inherits="value=errorDots"/>
-              <xul:label class="monospace console-caret title" xbl:inherits="value=errorCaret"/>
-              <xul:spacer flex="1"/>
-            </xul:hbox>
-          </xul:vbox>
-        </xul:vbox>
-      </xul:hbox>
-    </content>
-  </binding>
-    
-  <binding id="message" extends="chrome://browser/content/bindings.xml#richlistitem">
-    <content>
-      <xul:hbox class="console-internal-box" flex="1">
-        <xul:vbox class="console-row-content" flex="1">
-          <xul:vbox class="console-row-msg" flex="1">
-            <xul:description class="console-msg-text title" xbl:inherits="xbl:text=msg"/>
-          </xul:vbox>
-        </xul:vbox>
-      </xul:hbox>
-    </content>
-  </binding>
-  
-</bindings>
--- a/mobile/android/chrome/content/browser.css
+++ b/mobile/android/chrome/content/browser.css
@@ -60,25 +60,16 @@ menulist {
 richlistbox[batch] {
   -moz-binding: url("chrome://browser/content/bindings.xml#richlistbox-batch");
 }
 
 richlistitem {
   -moz-binding: url("chrome://browser/content/bindings.xml#richlistitem");
 }
 
-richlistitem[type="error"],
-richlistitem[type="warning"] {
-  -moz-binding: url("chrome://browser/content/bindings/console.xml#error");
-}
-
-richlistitem[type="message"]{
-  -moz-binding: url("chrome://browser/content/bindings/console.xml#message");
-}
-
 dialog {
   -moz-binding: url("chrome://browser/content/bindings/dialog.xml#dialog");
 }
 
 /* Do not allow these to inherit from the toolkit binding */
 dialog.content-dialog {
   -moz-binding: none;
 }
--- a/mobile/android/chrome/jar.mn
+++ b/mobile/android/chrome/jar.mn
@@ -10,17 +10,16 @@ chrome.jar:
   content/aboutHome.xhtml              (content/aboutHome.xhtml)
 * content/aboutRights.xhtml            (content/aboutRights.xhtml)
   content/blockedSite.xhtml            (content/blockedSite.xhtml)
   content/languages.properties         (content/languages.properties)
 * content/browser.xul                  (content/browser.xul)
 * content/browser.js                   (content/browser.js)
 * content/bindings.xml                 (content/bindings.xml)
   content/bindings/checkbox.xml        (content/bindings/checkbox.xml)
-  content/bindings/console.xml         (content/bindings/console.xml)
   content/bindings/dialog.xml          (content/bindings/dialog.xml)
   content/browser.css                  (content/browser.css)
   content/cursor.css                   (content/cursor.css)
 % content branding %content/branding/
   content/sanitize.js                  (content/sanitize.js)
   content/exceptions.js                (content/exceptions.js)
 * content/downloads.js                 (content/downloads.js)
   content/netError.xhtml               (content/netError.xhtml)
rename from mobile/android/locales/en-US/chrome/preferences.dtd
rename to mobile/android/locales/en-US/chrome/aboutHome.dtd
--- a/mobile/android/locales/en-US/chrome/preferences.dtd
+++ b/mobile/android/locales/en-US/chrome/aboutHome.dtd
@@ -1,24 +1,1 @@
-<!ENTITY prefsHeader.label                         "Preferences">
-<!ENTITY about.title                               "About &brandShortName;">
-<!ENTITY about.button                              "Go to Page">
-<!ENTITY content.title                             "Content">
-<!ENTITY reflowZoom.title                          "Reformat text on zoom">
-<!ENTITY showImages.title                          "Show images">
-<!ENTITY enableJavaScript.title                    "Enable JavaScript">
-<!ENTITY privacy.title                             "Privacy &amp; Security">
-<!ENTITY allowCookies.title                        "Allow cookies">
-<!ENTITY doNotTrack.title                          "Tell sites not to track me">
-<!ENTITY masterPassword.title                      "Use master password">
-<!ENTITY clearPrivateData2.title                   "Clear private data">
-<!ENTITY clearPrivateData.button                   "Clear">
-<!ENTITY rememberPasswords.title                   "Remember passwords">
-<!ENTITY language.title                            "Language">
-<!ENTITY language.auto                             "Auto-detect">
-<!ENTITY defaultBrowser.title                      "Default Browser">
-<!ENTITY defaultBrowser.description                "Make &brandShortName; your default browser">
-<!ENTITY homepage.title                            "Start page">
-<!ENTITY homepage.none                             "Blank Page">
 <!ENTITY homepage.default                          "&brandShortName; Start">
-<!ENTITY homepage.currentpage                      "Use Current Page">
-<!ENTITY showCharsetEncoding.title                 "Show character encoding">
-<!ENTITY actionbar.default                         "&brandShortName; Settings">
deleted file mode 100644
--- a/mobile/android/locales/en-US/chrome/browser.dtd
+++ /dev/null
@@ -1,110 +0,0 @@
-<!ENTITY urlbar.emptytext      "Enter Search or Address">
-
-<!ENTITY back.label            "Back">
-<!ENTITY forward.label         "Forward">
-<!ENTITY reload.label          "Reload">
-<!ENTITY stop.label            "Stop">
-<!ENTITY go.label              "Go">
-<!ENTITY star.label            "Star">
-
-<!ENTITY showTabs.label        "Show Tabs">
-<!ENTITY newtab.label          "New Tab">
-<!ENTITY closetab.label        "Close Tab">
-
-<!ENTITY allPagesHeader.label      "All Pages">
-<!ENTITY bookmarksHeader.label     "Bookmarks">
-<!ENTITY historyHeader.label       "History">
-<!ENTITY desktopHeader.label       "Desktop">
-
-<!ENTITY editBookmarkDialog.title  "Edit Bookmark">
-<!ENTITY editBookmarkDone.label    "Done">
-<!ENTITY editBookmarkTags.label    "Add tags here">
-
-<!ENTITY selectHelper.done         "Done">
-
-<!ENTITY addonsHeader.label        "Add-ons">
-<!ENTITY addonsLocal.label         "Your Add-ons">
-<!ENTITY addonsUpdate.label        "Update">
-<!ENTITY addonsRepo.label          "Get Add-ons">
-<!ENTITY addonsRecommended.label   "Recommended">
-<!ENTITY addonsSearch.label        "Search">
-<!ENTITY addonsSearch2.emptytext   "Search Catalog">
-<!ENTITY addonsSearch.recommended  "Recommended">
-
-<!ENTITY addonOptions.label        "Options">
-<!ENTITY addonEnable.label         "Enable">
-<!ENTITY addonDisable.label        "Disable">
-<!ENTITY addonInstall2.label       "Add to &brandShortName;">
-<!ENTITY addonUninstall.label      "Uninstall">
-<!ENTITY addonCancel.label         "Cancel">
-<!ENTITY addonShowPage.label       "Go to Page">
-
-<!ENTITY downloadsHeader.label     "Downloads">
-<!ENTITY downloadShowPage.label    "Go to Page">
-<!ENTITY downloadShow2.label       "Find">
-<!ENTITY downloadOpen2.label       "Open">
-<!ENTITY downloadCancel.label      "Cancel">
-<!ENTITY downloadPause.label       "Pause">
-<!ENTITY downloadResume.label      "Resume">
-<!ENTITY downloadRetry.label       "Retry">
-<!ENTITY downloadRemove.label      "Remove">
-<!ENTITY downloadDelete.label      "Delete">
-<!ENTITY downloadFailed.label      "Failed">
-
-<!ENTITY noResults.label           "No results">
-<!ENTITY allBookmarks.label        "See all bookmarks">
-
-<!ENTITY bookmarkPopup.label       "Page Bookmarked">
-<!ENTITY bookmarkRemove.label      "Remove">
-<!ENTITY bookmarkEdit.label        "Edit">
-<!ENTITY bookmarkShortcut.label    "Add to Home Screen">
-
-<!ENTITY identity.unverifiedsite2 "This website does not supply identity information.">
-<!ENTITY identity.connectedTo2 "Connected to">
-<!-- Localization note (identity.runBy2)
- The layout of the identity dialog prevents combining this into a single string with
- substitution variables.  If it is difficult to translate the sense of the string
- with that structure, consider a translation which ignores the preceding domain and
- just addresses the organization to follow, e.g. "This site is run by " -->
-<!ENTITY identity.runBy2 "run by">
-
-<!ENTITY consoleHeader.label       "Error Console">
-<!ENTITY consoleAll.label          "All">
-<!ENTITY consoleErrors.label       "Errors">
-<!ENTITY consoleWarnings.label     "Warnings">
-<!ENTITY consoleMessages.label     "Messages">
-<!ENTITY consoleCodeEval.label     "Code:">
-<!ENTITY consoleClear.label        "Clear">
-<!ENTITY consoleEvaluate.label     "…">
-<!ENTITY consoleErrFile.label      "Source File:">
-<!ENTITY consoleErrLine.label      "Line:">
-<!ENTITY consoleErrColumn.label    "Column:">
-
-<!ENTITY contextOpenInNewTab.label    "Open Link in New Tab">
-<!ENTITY contextSaveImage.label       "Save Image">
-<!ENTITY contextCopyLink.label        "Copy Link">
-<!ENTITY contextCopyEmail.label       "Copy Email Address">
-<!ENTITY contextCopyPhone.label       "Copy Phone Number">
-<!ENTITY contextCopyImageLocation.label       "Copy Image Location">
-<!ENTITY contextShareLink.label       "Share Link">
-<!ENTITY contextShareImage.label      "Share Image">
-<!ENTITY contextBookmarkLink.label    "Bookmark Link">
-<!ENTITY contextSaveVideo.label       "Save Video">
-<!ENTITY contextShareVideo.label      "Share Video">
-<!ENTITY contextPlayMedia.label       "Play">
-<!ENTITY contextPauseMedia.label      "Pause">
-<!ENTITY contextFullScreen.label      "Full Screen">
-<!ENTITY contextEditBookmark.label    "Edit">
-<!ENTITY contextRemoveBookmark.label  "Remove">
-<!ENTITY contextShortcutBookmark.label "Add to Home Screen">
-
-<!ENTITY pageactions.saveas.pdf      "Save As PDF">
-<!ENTITY pageactions.share.page      "Share Page">
-<!ENTITY pageactions.password.forget "Forget Password">
-<!ENTITY pageactions.quit            "Quit">
-<!ENTITY pageactions.reset           "Clear Site Preferences">
-<!ENTITY pageactions.findInPage      "Find In Page">
-<!ENTITY pageactions.search.addNew   "Add Search Engine">
-<!ENTITY pageactions.charEncoding    "Character Encoding">
-
-<!ENTITY appMenu.siteOptions         "Site Options">
--- a/mobile/android/locales/en-US/chrome/browser.properties
+++ b/mobile/android/locales/en-US/chrome/browser.properties
@@ -1,105 +1,18 @@
-# Add-on Manager
-addonsLocalNone.label=No add-ons installed
-addonsSearchStart.label=Searching for add-ons…
-addonsSearchStart.button=Cancel
-addonsSearchNone.search=No matches found
-addonsSearchNone.recommended=No recommended add-ons
-addonsSearchNone.button=Try Again
-addonsSearchFail.label=%S couldn't retrieve add-ons
-addonsSearchFail.retryButton=Retry
-addonsSearchSuccess2.button=Clear Search
-addonsBrowseAll.label=Browse all add-ons
-addonsBrowseAll.description=addons.mozilla.org has many to explore
-addonsBrowseAll.seeMore=See More Add-ons
-addonsBrowseAll.browseSite=Browse Site
-
-# LOCALIZATION NOTE (addonsSearchMore.label): Semi-colon list of plural forms.
-# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
-# #1 total number of add-ons that match the search terms
-addonsSearchMore.label=Show result;Show all #1 results
-
-# LOCALIZATION NOTE (addonsSearchMore.description): Semi-colon list of plural forms.
-# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
-# #1 number of search results currently visible
-addonsSearchMore.description=If this result isn't what you're looking for, try this;If these #1 results aren't what you're looking for, try this
-
-addonsWhatAre.label=What are Add-ons?
-addonsWhatAre.button=Learn More
-
-# LOCALIZATION NOTE (addonsWhatAre.description):
-# #1 is the application name
-addonsWhatAre.description=Add-ons are applications that let you personalize #1 with extra functionality or style. You can make #1 your own.
-
-addonsSearchEngine.description=Integrated Search
-
 addonsConfirmInstall.title=Installing Add-on
 addonsConfirmInstall.install=Install
 
-addonUpdate.checking=Checking for updates…
-addonUpdate.updating=Updating to %S
-addonUpdate.updated=Updated to %S
-addonUpdate.compatibility=A compatibility update has been applied
-addonUpdate.noupdate=No updates were found
-addonUpdate.notsupported=Updates not supported
-addonUpdate.disabled=Updates are disabled
-addonUpdate.error=An error occurred
-
-addonBlocked.blocked=Blocked
-addonBlocked.softBlocked=Known to cause security or stability issues
-addonBlocked.outdated=Out of date
-
-# LOCALIZATION NOTE (addonError-1, addonError-2, addonError-3, addonError-4):
-# #1 is the add-on name, #2 is the add-on host, #3 is the application name
-addonError-1=The add-on could not be downloaded because of a connection failure on #2.
-addonError-2=The add-on from #2 could not be installed because it does not match the add-on #3 expected.
-addonError-3=The add-on downloaded from #2 could not be installed because it appears to be corrupt.
-addonError-4=#1 could not be installed because #3 cannot modify the needed file.
-
-# LOCALIZATION NOTE (addonLocalError-1, addonLocalError-2, addonLocalError-3, addonLocalError-4, addonErrorIncompatible, addonErrorBlocklisted):
-# #1 is the add-on name, #3 is the application name, #4 is the application version
-addonLocalError-1=This add-on could not be installed because of a filesystem error.
-addonLocalError-2=This add-on could not be installed because it does not match the add-on #3 expected.
-addonLocalError-3=This add-on could not be installed because it appears to be corrupt.
-addonLocalError-4=#1 could not be installed because #3 cannot modify the needed file.
-addonErrorIncompatible=#1 could not be installed because it is not compatible with #3 #4.
-addonErrorBlocklisted=#1 could not be installed because it has a high risk of causing stability or security problems.
-
-# Download Manager
-# LOCALIZATION NOTE (Status): — is the "em dash" (long dash)
-# #1 download size for FINISHED or download state; #2 host (e.g., eTLD + 1, IP)
-downloadsStatus=#1 — #2
-# LOCALIZATION NOTE (Time): #1 left time for UNFINISHED, total time for FINISHED
-downloadsTime= — #1
-downloadsUnknownSize=Unknown size
-# LOCALIZATION NOTE (KnownSize): #1 size number; #2 size unit
-downloadsKnownSize=#1 #2
-downloadsYesterday=Yesterday
-# LOCALIZATION NOTE (MonthDate): #1 month name; #2 date number; e.g., January 22
-downloadsMonthDate=#1 #2
-downloadsEmpty=No downloads
-downloadsDeleteTitle=Delete File
-
 # Alerts
 alertAddons=Add-ons
 alertAddonsDownloading=Downloading add-on
 alertAddonsInstalling=Installing add-on
 alertAddonsInstalled=Installation complete. Restart required.
 alertAddonsInstalledNoRestart=Installation complete
 alertAddonsFail=Installation failed
-alertLinkBookmarked=Bookmark added
-alertLockScreen=Screen Orientation
-alertLockScreen.locked=Locked
-alertLockScreen.unlocked=Unlocked
-
-# LOCALIZATION NOTE (alertAddonsDisabled): Semi-colon list of plural forms.
-# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
-# #1 number of add-ons
-alertAddonsDisabled=#1 incompatible add-on was disabled;#1 incompatible add-ons were disabled
 
 alertDownloads=Downloads
 alertDownloadsStart=Downloading: %S
 alertDownloadsDone=%S has finished downloading
 alertCantOpenDownload=Can't open file. Tap to save it.
 alertDownloadsSize=Download too big
 alertDownloadsNoSpace=Not enough storage space
 alertDownloadsToast=Download started…
@@ -230,25 +143,16 @@ tabs.crashClose=Close tab
 tabs.crashReload=Reload tab
 
 # Homepage
 # LOCALIZATION NOTE: homepage.custom2 is the text displayed on the selector button if
 # the user selects a webpage to be the startpage. We can't display the entire URL
 # or webpage title on the menulist
 homepage.custom2=Custom Page
 
-# Page Actions
-pageactions.saveas.pdf=Save As PDF
-pageactions.geolocation=Location
-pageactions.popup=Popups
-pageactions.offline-app=Offline Storage
-pageactions.password=Password
-pageactions.desktop-notification=Web Notifications
-pageactions.openWebappsManage=Manage Web Apps
-
 # Open Search
 opensearch.searchWith=Search With:
 opensearch.searchFor=Search for "%S"
 
 # Open in Another App
 # LOCALIZATION NOTE: openinapp.specific is the text displayed if there is a single external app
 # %S is the name of the app, like "YouTube" or "Picassa"
 openinapp.specific=Open in %S App
--- a/mobile/android/locales/jar.mn
+++ b/mobile/android/locales/jar.mn
@@ -1,23 +1,22 @@
 #filter substitution
 
 @AB_CD@.jar:
 % locale browser @AB_CD@ %locale/@AB_CD@/browser/
   locale/@AB_CD@/browser/about.dtd                (%chrome/about.dtd)
   locale/@AB_CD@/browser/aboutAddons.dtd          (%chrome/aboutAddons.dtd)
   locale/@AB_CD@/browser/aboutAddons.properties   (%chrome/aboutAddons.properties)
   locale/@AB_CD@/browser/aboutCertError.dtd       (%chrome/aboutCertError.dtd)
-  locale/@AB_CD@/browser/browser.dtd              (%chrome/browser.dtd)
   locale/@AB_CD@/browser/browser.properties       (%chrome/browser.properties)
   locale/@AB_CD@/browser/config.dtd               (%chrome/config.dtd)
   locale/@AB_CD@/browser/config.properties        (%chrome/config.properties)
   locale/@AB_CD@/browser/localepicker.properties  (%chrome/localepicker.properties)
   locale/@AB_CD@/browser/region.properties        (%chrome/region.properties)
-  locale/@AB_CD@/browser/preferences.dtd          (%chrome/preferences.dtd)
+  locale/@AB_CD@/browser/aboutHome.dtd            (%chrome/aboutHome.dtd)
   locale/@AB_CD@/browser/checkbox.dtd             (%chrome/checkbox.dtd)
   locale/@AB_CD@/browser/notification.dtd         (%chrome/notification.dtd)
   locale/@AB_CD@/browser/sync.dtd                 (%chrome/sync.dtd)
   locale/@AB_CD@/browser/sync.properties          (%chrome/sync.properties)
   locale/@AB_CD@/browser/prompt.dtd               (%chrome/prompt.dtd)
   locale/@AB_CD@/browser/webapps.dtd              (%chrome/webapps.dtd)
   locale/@AB_CD@/browser/feedback.dtd             (%chrome/feedback.dtd)
   locale/@AB_CD@/browser/phishing.dtd             (%chrome/phishing.dtd)