Backed out changeset c29869656f46 due to wrong bug number.
authorJared Wein <jwein@mozilla.com>
Wed, 22 Aug 2012 16:54:35 -0700
changeset 105120 0abb573e90fcd05c6b9a658aa12794ec49b3ec50
parent 105119 4317c2e28a5c85037a3d0d1c5f2bbc5cf6cc2f54
child 105121 6e3a0a5d61a3bfc2f489068a752733f15bb7fb68
push id55
push usershu@rfrn.org
push dateThu, 30 Aug 2012 01:33:09 +0000
milestone17.0a1
backs outc29869656f46a7c3dc14854b40294664d47687cb
Backed out changeset c29869656f46 due to wrong bug number.
mobile/android/chrome/content/aboutAddons.xhtml
mobile/android/chrome/content/aboutApps.xhtml
mobile/android/locales/en-US/chrome/aboutAddons.dtd
mobile/android/locales/en-US/chrome/aboutApps.dtd
--- a/mobile/android/chrome/content/aboutAddons.xhtml
+++ b/mobile/android/chrome/content/aboutAddons.xhtml
@@ -11,17 +11,17 @@
 ]>
 
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-  <title>&aboutAddons.title2;</title>
+  <title>&aboutAddons.title;</title>
   <meta name="viewport" content="width=480; initial-scale=.6667; user-scalable=0" />
   <link rel="icon" type="image/png" href="chrome://branding/content/favicon32.png" />
   <link rel="stylesheet" href="chrome://browser/skin/aboutAddons.css" type="text/css"/>
   <style>
     .hide-on-enable,
     .show-on-error,
     .show-on-uninstall,
     .show-on-install,
--- a/mobile/android/chrome/content/aboutApps.xhtml
+++ b/mobile/android/chrome/content/aboutApps.xhtml
@@ -18,26 +18,26 @@
   <!ENTITY % aboutAppsDTD SYSTEM "chrome://browser/locale/aboutApps.dtd">
   %aboutAppsDTD;
   <!ENTITY % browserDTD SYSTEM "chrome://browser/locale/browser.dtd" >
   %browserDTD;
 ]>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
-    <title>&aboutApps.title2;</title>
+    <title>&aboutApps.title;</title>
     <meta name="viewport" content="width=480; initial-scale=.6667; user-scalable=0" />
     <link rel="icon" type="image/png" href="chrome://branding/content/favicon32.png" />
     <link rel="stylesheet" type="text/css" href="chrome://browser/skin/aboutApps.css" media="all" />
     <script type="text/javascript;version=1.8" src="chrome://browser/content/aboutApps.js"></script>
   </head>
 
   <body dir="&locale.dir;" onload="onLoad(event)" onunload="onUnload(event)">
     <div class="header">
-      <div>&aboutApps.header;</div>
+      <div>&aboutApps.title;</div>
       <img src="chrome://browser/skin/images/addons-amo-hdpi.png" class="icon" pref="app.marketplaceURL" onclick="openLink(this);"/>
     </div>
     <div id="main-container">
       <div id="noapps" class="hidden">
         &aboutApps.noApps.pre;<a id="marketplaceURL" pref="app.marketplaceURL">&aboutApps.noApps.middle2;</a>&aboutApps.noApps.post;
       </div>
       <div>
         <div class="spacer" id="spacer1"> </div>
--- a/mobile/android/locales/en-US/chrome/aboutAddons.dtd
+++ b/mobile/android/locales/en-US/chrome/aboutAddons.dtd
@@ -1,12 +1,12 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<!ENTITY aboutAddons.title2                     "Add-ons">
+<!ENTITY aboutAddons.title                      "Add-ons Manager">
 <!ENTITY aboutAddons.header2                    "Your Add-ons">
 <!ENTITY aboutAddons.options                    "Options">
 
 <!ENTITY addonAction.enable                     "Enable">
 <!ENTITY addonAction.disable                    "Disable">
 <!ENTITY addonAction.uninstall                  "Uninstall">
 <!ENTITY addonAction.undo                       "Undo">
--- a/mobile/android/locales/en-US/chrome/aboutApps.dtd
+++ b/mobile/android/locales/en-US/chrome/aboutApps.dtd
@@ -1,13 +1,12 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<!ENTITY aboutApps.title2                          "Apps">
-<!ENTITY aboutApps.header                          "Your Apps">
+<!ENTITY aboutApps.title "Your Apps">
 
 <!-- LOCALIZATION NOTE (aboutApps.noApps.pre): include a trailing space as needed -->
 <!-- LOCALIZATION NOTE (aboutApps.noApps.middle): avoid leading/trailing spaces, this text is a link -->
 <!-- LOCALIZATION NOTE (aboutApps.noApps.post): include a starting space as needed -->
 <!ENTITY aboutApps.noApps.pre "No web apps installed. Get some from the ">
 <!ENTITY aboutApps.noApps.middle2 "Mozilla Marketplace">
 <!ENTITY aboutApps.noApps.post ".">