imported patch strings

mobile/chrome/content/bindings/extensions.xml

@@ -3,6 +3,8 @@
 <!DOCTYPE bindings [
 <!ENTITY % browserDTD SYSTEM "chrome://browser/locale/browser.dtd">
 %browserDTD;
+<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
+%brandDTD;
 ]>
 
 <bindings
@@ -18,6 +20,8 @@
           <xul:hbox align="center">
             <xul:label class="title" xbl:inherits="value=name"/>
             <xul:label class="normal" xbl:inherits="value=version"/>
+            <xul:spacer flex="1"/>
+            <xul:label class="normal" crop="end" xbl:inherits="value=typeLabel"/>            
           </xul:hbox>
           <xul:label class="normal hide-on-select" xbl:inherits="value=description" crop="end" flex="1"/>
           <xul:description class="normal show-on-select" xbl:inherits="xbl:text=description" flex="1"/>
@@ -108,6 +112,8 @@
         <xul:hbox align="center">
           <xul:label class="title" xbl:inherits="value=name"/>
           <xul:label class="normal" xbl:inherits="value=version"/>
+          <xul:spacer flex="1"/>
+          <xul:hbox class="addon-type-or-rating" align="center" xbl:inherits="rating"/>            
         </xul:hbox>
         <xul:label class="normal hide-on-select" xbl:inherits="value=description" crop="end" flex="1"/>
         <xul:description class="normal show-on-select" xbl:inherits="xbl:text=description" flex="1"/>
@@ -115,7 +121,7 @@
           <xul:button class="addon-install hide-on-install hide-on-restart" label="&addonShowPage.label;"
                       oncommand="ExtensionsView.showPage(document.getBindingParent(this));"/>
           <xul:spacer flex="1"/>
-          <xul:button class="addon-install hide-on-install hide-on-restart" label="&addonInstall.label;"
+          <xul:button class="addon-install hide-on-install hide-on-restart" label="&addonInstall2.label;"
                       oncommand="ExtensionsView.installFromRepo(document.getBindingParent(this));"/>
         </xul:hbox>
         <xul:progressmeter class="show-on-install" mode="normal" value="0" xbl:inherits="value=progress"/>
@@ -133,4 +139,16 @@
     </content>
   </binding>
 
+  <binding id="extension-search-recommended">
+    <content>
+      <xul:label class="normal" value="&addonsSearch.recommended;" crop="end"/>
+    </content>
+  </binding>
+
+  <binding id="extension-search-rating">
+    <content>
+      <xul:image class="addon-rating" xbl:inherits="rating"/>
+    </content>
+  </binding>
+
 </bindings>

mobile/chrome/content/browser.css

@@ -96,6 +96,14 @@ richlistitem[typeName="search"] {
   -moz-binding: url("chrome://browser/content/bindings/extensions.xml#extension-search");
 }
 
+richlistitem[typeName="search"] hbox.addon-type-or-rating {
+  -moz-binding: url("chrome://browser/content/bindings/extensions.xml#extension-search-recommended");
+}
+
+richlistitem[typeName="search"] hbox.addon-type-or-rating[rating] {
+  -moz-binding: url("chrome://browser/content/bindings/extensions.xml#extension-search-rating");
+}
+
 richlistitem[typeName="message"] {
   -moz-binding: url("chrome://browser/content/bindings/extensions.xml#extension-message");
 }

mobile/chrome/content/browser.xul

@@ -329,7 +329,7 @@
               </richlistitem>
               <richlistitem id="addons-repo" class="section-header">
                 <label value="&addonsRepo.label;" flex="1"/>
-                <textbox id="addons-search-text" emptytext="&addonsSearch.emptytext;" type="search" searchbutton="false"
+                <textbox id="addons-search-text" emptytext="&addonsSearch2.emptytext;" type="search" searchbutton="false"
                          oncommand="ExtensionsView.getAddonsFromRepo(this.value);"/>
               </richlistitem>
             </richlistbox>
@@ -348,7 +348,7 @@
               </radiogroup>
             </box>
             <hbox id="downloads-search-box" pack="end" collapsed="true">
-              <textbox id="downloads-search-text" emptytext="&downloadsSearch.emptytext;" type="search" searchbutton="false"
+              <textbox id="downloads-search-text" emptytext="&downloadsSearch2.emptytext;" type="search" searchbutton="false"
                        oncommand="DownloadsView.getDownloads();"/>
             </hbox>
           </vbox>

mobile/chrome/content/extensions.js

@@ -50,6 +50,7 @@ var ExtensionsView = {
   _pref: null,
   _rdf: null,
   _ios: null,
+  _strings: {},
   _repo: null,
   _list: null,
   _localItem: null,
@@ -97,6 +98,7 @@ var ExtensionsView = {
     item.setAttribute("addonID", aAddon.id);
     item.setAttribute("typeName", aTypeName);
     item.setAttribute("type", aAddon.type);
+    item.setAttribute("typeLabel", this._strings["addonType." + aAddon.type]);
     item.setAttribute("name", aAddon.name);
     item.setAttribute("version", aAddon.version);
     item.setAttribute("iconURL", aAddon.iconURL);
@@ -241,6 +243,11 @@ var ExtensionsView = {
       this.showRestart();
       this._restartCount--; // showRestart() always increments
     }
+    
+    let strings = document.getElementById("bundle_browser");
+    this._strings["addonType.2"] = strings.getString("addonType.2");
+    this._strings["addonType.4"] = strings.getString("addonType.4");
+    this._strings["addonType.8"] = strings.getString("addonType.8");
 
     let self = this;
     setTimeout(function() {
@@ -459,6 +466,8 @@ var ExtensionsView = {
       listitem.setAttribute("homepageURL", addon.homepageURL);
       listitem.setAttribute("xpiURL", addon.xpiURL);
       listitem.setAttribute("xpiHash", addon.xpiHash);
+      if (!aIsRecommended)
+        listitem.setAttribute("rating", addon.rating);
       this._list.appendChild(listitem);
     }
 

mobile/locales/en-US/chrome/browser.dtd

@@ -1,20 +1,11 @@
 <!ENTITY back.label            "Back">
-<!ENTITY back.tooltip          "Back">
 <!ENTITY forward.label         "Forward">
-<!ENTITY forward.tooltip       "Forward">
 <!ENTITY reload.label          "Reload">
-<!ENTITY reload.tooltip        "Reload">
 <!ENTITY stop.label            "Stop">
-<!ENTITY stop.tooltip          "Stop">
 <!ENTITY search.label          "Search">
-<!ENTITY search.tooltip        "Search">
 <!ENTITY go.label              "Go">
-<!ENTITY go.tooltip            "Go">
 <!ENTITY openLocation.label    "Open location">
-<!ENTITY openLocation.tooltip  "Open location">
 <!ENTITY star.label            "Star">
-<!ENTITY star.tooltip          "Bookmark this page">
-<!ENTITY bookmarks.tooltip     "View bookmarks">
 
 <!ENTITY newtab.label          "New Tab">
 <!ENTITY closetab.label        "Close Tab">
@@ -55,12 +46,13 @@
 <!ENTITY addonsRepo.label          "Get Add-ons">
 <!ENTITY addonsRecommended.label   "Recommended">
 <!ENTITY addonsSearch.label        "Search">
-<!ENTITY addonsSearch.emptytext    "Search all add-ons">
+<!ENTITY addonsSearch2.emptytext   "Search Catalog">
+<!ENTITY addonsSearch.recommended  "Recommended">
 
 <!ENTITY addonOptions.label        "Options">
 <!ENTITY addonEnable.label         "Enable">
 <!ENTITY addonDisable.label        "Disable">
-<!ENTITY addonInstall.label        "Install">
+<!ENTITY addonInstall2.label       "Add to &brandShortName;">
 <!ENTITY addonUninstall.label      "Uninstall">
 <!ENTITY addonCancel.label         "Cancel">
 <!ENTITY addonShowPage.label       "Go to Page">
@@ -70,7 +62,7 @@
 <!ENTITY downloadsSortSite.label   "Site">
 <!ENTITY downloadsSortName.label   "Name">
 <!ENTITY downloadsSearch.label     "Search">
-<!ENTITY downloadsSearch.emptytext "Search for downloaded file">
+<!ENTITY downloadsSearch2.emptytext "Search">
 
 <!ENTITY downloadShowPage.label    "Go to Page">
 <!ENTITY downloadShow2.label       "Find">

mobile/locales/en-US/chrome/browser.properties

@@ -13,6 +13,10 @@ addonsSearchFail.label=%S couldn't retrieve add-ons
 addonsSearchFail.button=OK
 addonsSearchSuccess.button=Clear search
 
+addonType.2=Extension
+addonType.4=Theme
+addonType.8=Locale
+
 # 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)

mobile/themes/hildon/browser.css

@@ -374,6 +374,36 @@ toolbarbutton.page-button {
   }
 }
 
+.addon-rating[rating] {
+  width: 78px;
+  height: 18px;
+  list-style-image: url("chrome://browser/skin/images/ratings-18.png");
+}
+
+.addon-rating[rating="0"] {
+  -moz-image-region: rect(0px 78px 18px 0px);
+}
+
+.addon-rating[rating="1"] {
+  -moz-image-region: rect(18px 78px 36px 0px);
+}
+
+.addon-rating[rating="2"] {
+  -moz-image-region: rect(36px 78px 54px 0px);
+}
+
+.addon-rating[rating="3"] {
+  -moz-image-region: rect(54px 78px 72px 0px);
+}
+
+.addon-rating[rating="4"] {
+  -moz-image-region: rect(72px 78px 90px 0px);
+}
+
+.addon-rating[rating="5"] {
+  -moz-image-region: rect(90px 78px 108px 0px);
+}
+
 /* console panel UI   ------------------------------------------------------ */
 @media (orientation: landscape) {
   #console-filter-warnings,

mobile/themes/hildon/jar.mn

@@ -13,6 +13,7 @@ chrome.jar:
   browser.css                          (browser.css)
   notification.css                     (notification.css)
   images/arrowright-16.png             (images/arrowright-16.png)
+  images/ratings-18.png                (images/ratings-18.png)
   images/favicon-default-30.png        (images/favicon-default-30.png)
   images/starred-64.png                (images/starred-64.png)
   images/throbber.png                  (images/throbber.png)

mobile/themes/wince/browser-high.css

@@ -312,6 +312,38 @@ findbar .findbar-closebutton {
   -moz-box-orient: horizontal;
 }
 
+/* Add-ons panel   --------------------------------------------------------- */
+.addon-rating[rating] {
+  width: 78px;
+  height: 18px;
+  list-style-image: url("chrome://browser/skin/images/ratings-18.png");
+}
+
+.addon-rating[rating="0"] {
+  -moz-image-region: rect(0px 78px 18px 0px);
+}
+
+.addon-rating[rating="1"] {
+  -moz-image-region: rect(18px 78px 36px 0px);
+}
+
+.addon-rating[rating="2"] {
+  -moz-image-region: rect(36px 78px 54px 0px);
+}
+
+.addon-rating[rating="3"] {
+  -moz-image-region: rect(54px 78px 72px 0px);
+}
+
+.addon-rating[rating="4"] {
+  -moz-image-region: rect(72px 78px 90px 0px);
+}
+
+.addon-rating[rating="5"] {
+  -moz-image-region: rect(90px 78px 108px 0px);
+}
+
+/* select popup ------------------------------------------------------------ */
 #select-list > option[selected="true"] > image {
   list-style-image: url("chrome://browser/skin/images/check-30.png");
 }

mobile/themes/wince/browser-low.css

@@ -312,6 +312,37 @@ findbar .findbar-closebutton {
   -moz-box-orient: vertical;
 }
 
+/* Add-ons panel   --------------------------------------------------------- */
+.addon-rating[rating] {
+  width: 78px;
+  height: 18px;
+  list-style-image: url("chrome://browser/skin/images/ratings-18.png");
+}
+
+.addon-rating[rating="0"] {
+  -moz-image-region: rect(0px 78px 18px 0px);
+}
+
+.addon-rating[rating="1"] {
+  -moz-image-region: rect(18px 78px 36px 0px);
+}
+
+.addon-rating[rating="2"] {
+  -moz-image-region: rect(36px 78px 54px 0px);
+}
+
+.addon-rating[rating="3"] {
+  -moz-image-region: rect(54px 78px 72px 0px);
+}
+
+.addon-rating[rating="4"] {
+  -moz-image-region: rect(72px 78px 90px 0px);
+}
+
+.addon-rating[rating="5"] {
+  -moz-image-region: rect(90px 78px 108px 0px);
+}
+
 /* select popup ------------------------------------------------------------ */
 #select-list > option[selected="true"] > image {
   list-style-image: url("chrome://browser/skin/images/check-24.png");

mobile/themes/wince/jar.mn

@@ -15,6 +15,7 @@ chrome.jar:
   browser-low.css                      (browser-low.css)
   notification.css                     (notification.css)
   images/arrowright-16.png             (images/arrowright-16.png)
+  images/ratings-18.png                (images/ratings-18.png)
 
   images/favicon-default-30.png        (images/favicon-default-30.png)
   images/starred-64.png                (images/starred-64.png)