From 3925937354bcddc1ec10b458a38d5d3dc0199157 Mon Sep 17 00:00:00 2001
From: Dave Lawrence <dlawrence@mozilla.com>
Date: Mon, 2 Jul 2012 10:16:39 -0400
Subject: Bug 769731 - Please rename the "Fennec Native" product to "Firefox
 for Android" r=glob

---
 extensions/BMO/lib/Data.pm                                        | 8 ++++----
 .../BMO/template/en/default/global/choose-product.html.tmpl       | 4 ++--
 extensions/ContributorEngagement/lib/Constants.pm                 | 2 +-
 .../GuidedBugEntry/template/en/default/guided/products.html.tmpl  | 5 ++---
 extensions/GuidedBugEntry/web/js/products.js                      | 4 ++--
 5 files changed, 11 insertions(+), 12 deletions(-)

(limited to 'extensions')

diff --git a/extensions/BMO/lib/Data.pm b/extensions/BMO/lib/Data.pm
index 02d5aadd3..5d8d6acbe 100644
--- a/extensions/BMO/lib/Data.pm
+++ b/extensions/BMO/lib/Data.pm
@@ -52,7 +52,7 @@ tie(%$cf_visible_in_products, "Tie::IxHash",
         "Boot2Gecko"       => [],
         "Core"             => [],
         "Fennec"           => [],
-        "Fennec Native"    => [],
+        "Firefox for Android" => [],
         "Firefox"          => [],
         "Marketplace"      => [],
         "mozilla.org"      => [],
@@ -71,7 +71,7 @@ tie(%$cf_visible_in_products, "Tie::IxHash",
         "AUS"                   => [],
         "Core"                  => [],
         "Fennec"                => [],
-        "Fennec Native"         => [],
+        "Firefox for Android"    => [],
         "Marketing"             => ["General"],
         "mozilla.org"           => ["Release Engineering", qr/^Release Engineering: /],
         "Mozilla Localizations" => [],
@@ -104,7 +104,7 @@ tie(%$cf_visible_in_products, "Tie::IxHash",
         "Core"                  => [],
         "Directory"             => [],
         "Fennec"                => [],
-        "Fennec Native"         => [], 
+        "Firefox for Android"    => [], 
         "Firefox"               => [],
         "MailNews Core"         => [],
         "mozilla.org"           => ["Release Engineering", qr/^Release Engineering: /],
@@ -142,7 +142,7 @@ tie(%$cf_visible_in_products, "Tie::IxHash",
         "Camino"                => [], 
         "Composer"              => [], 
         "Fennec"                => [], 
-        "Fennec Native"         => [], 
+        "Firefox for Android"    => [], 
         "Firefox"               => [], 
         "Mozilla Localizations" => [], 
         "Mozilla Services"      => [], 
diff --git a/extensions/BMO/template/en/default/global/choose-product.html.tmpl b/extensions/BMO/template/en/default/global/choose-product.html.tmpl
index c72d72229..813a35725 100644
--- a/extensions/BMO/template/en/default/global/choose-product.html.tmpl
+++ b/extensions/BMO/template/en/default/global/choose-product.html.tmpl
@@ -97,8 +97,8 @@
    icon="seamonkey.png"
 %]
 [% INCLUDE easyproduct
-   name="Fennec Native"
-   icon="fennec.png"
+   name="Firefox for Android"
+   icon="firefox.png"
 %]
 [% INCLUDE easyproduct
    name="Mozilla Localizations"
diff --git a/extensions/ContributorEngagement/lib/Constants.pm b/extensions/ContributorEngagement/lib/Constants.pm
index fe7ae803b..851c0dbc2 100644
--- a/extensions/ContributorEngagement/lib/Constants.pm
+++ b/extensions/ContributorEngagement/lib/Constants.pm
@@ -21,7 +21,7 @@ use constant EMAIL_FROM => 'bugzilla-daemon@mozilla.org';
 
 use constant ENABLED_PRODUCTS => (
     "Core",
-    "Fennec Native", 
+    "Firefox for Android", 
     "Firefox",
     "Testing", 
     "Toolkit", 
diff --git a/extensions/GuidedBugEntry/template/en/default/guided/products.html.tmpl b/extensions/GuidedBugEntry/template/en/default/guided/products.html.tmpl
index f8a68e7c9..22c93a354 100644
--- a/extensions/GuidedBugEntry/template/en/default/guided/products.html.tmpl
+++ b/extensions/GuidedBugEntry/template/en/default/guided/products.html.tmpl
@@ -11,9 +11,8 @@
    icon="firefox.png"
 %]
 [% INCLUDE product_block
-   name="Fennec Native"
-   caption="Firefox for Mobile (Android)"
-   icon="fennec.png"
+   name="Firefox for Android"
+   icon="firefox.png"
 %]
 [% INCLUDE product_block
    name="Thunderbird"
diff --git a/extensions/GuidedBugEntry/web/js/products.js b/extensions/GuidedBugEntry/web/js/products.js
index de6dfa330..9f9b62a14 100644
--- a/extensions/GuidedBugEntry/web/js/products.js
+++ b/extensions/GuidedBugEntry/web/js/products.js
@@ -48,7 +48,7 @@ var products = {
   },
 
   "Fennec": {
-    related: [ "Fennec Native", "Core", "Toolkit" ],
+    related: [ "Firefox for Android", "Core", "Toolkit" ],
     detectPlatform: true,
     support:
       'If you are new to Firefox or Bugzilla, please consider checking ' +
@@ -57,7 +57,7 @@ var products = {
       ' <b>Firefox Help</b></a> instead of creating a bug.'
   },
 
-  "Fennec Native": {
+  "Firefox for Android": {
     related: [ "Fennec", "Core", "Toolkit" ],
     detectPlatform: true,
     support:
-- 
cgit v1.2.3-24-g4f1b