From f569d5ef56d4975fe8ffee7182125cac776c327d Mon Sep 17 00:00:00 2001
From: David Lawrence <dkl@mozilla.com>
Date: Tue, 3 Mar 2015 15:19:45 +0000
Subject: Bug 1138541: Updating lists on Gear Request form

---
 .../en/default/bug/create/create-swag.html.tmpl    | 41 ++++++++++------------
 1 file changed, 19 insertions(+), 22 deletions(-)

(limited to 'extensions/BMO/template/en/default/bug/create/create-swag.html.tmpl')

diff --git a/extensions/BMO/template/en/default/bug/create/create-swag.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-swag.html.tmpl
index 89f4c8987..b766e324b 100644
--- a/extensions/BMO/template/en/default/bug/create/create-swag.html.tmpl
+++ b/extensions/BMO/template/en/default/bug/create/create-swag.html.tmpl
@@ -10,8 +10,8 @@
 
 [%
 items = [
-  { id => ''        , name => 'Splendidest Gear'                  },
-  { id => '#155752' , name => 'Moleskine Notebook'                },
+  { id => ''        , name => 'Splendidest gear'                  },
+  { id => '#185687' , name => 'Moleskine Notebook'                },
   { id => '#155749' , name => 'Rickshaw Messenger Bag'            },
   { id => '#155415S', name => 'Champion Hooded Sweatshirt S'      },
   { id => '#155415M', name => 'Champion Hooded Sweatshirt M'      },
@@ -27,11 +27,10 @@ items = [
   { id => '#157452L', name => 'Very Splendid Package, Ladies L'   },
   { id => '#157452X', name => 'Very Splendid Package, Ladies XL'  },
   { id => '#157451S', name => 'Most Splendid Package, S'          },
-  { id => '#157451M', name => 'Most Splendid Package, M'          },
-  { id => '#157451L', name => 'Most Splendid Package, L'          },
-  { id => '#157451X', name => 'Most Splendid Package, XL'         },
+  { id => '#157451M', name => 'Most Splendid Package, M '         },
+  { id => '#157451L', name => 'Most Splendid Package, L '         },
+  { id => '#157451X', name => 'Most Splendid Package, XL '        },
   { id => ''        , name => 'Splendider'                        },
-  { id => '#155341M', name => 'Unisex T-shirt Poppy M'            },
   { id => '#155341X', name => 'Unisex T-shirt Poppy XL'           },
   { id => '#1553412', name => 'Unisex T-shirt Poppy 2XL'          },
   { id => '#155344S', name => 'Ladies\' T-shirt Poppy S'          },
@@ -41,32 +40,30 @@ items = [
   { id => '#190928M', name => 'Unisex T-shirt Navy M'             },
   { id => '#190928L', name => 'Unisex T-shirt Navy L'             },
   { id => '#190928X', name => 'Unisex T-shirt Navy XL'            },
-  { id => '#190929L', name => 'Unisex T-shirt Lapis L'            },
   { id => '#1553422', name => 'Unisex T-shirt Navy 2XL'           },
   { id => '#1553423', name => 'Unisex T-shirt Navy 3XL'           },
   { id => '#155413S', name => 'Ladies\' T-shirt Navy S'           },
   { id => '#155413M', name => 'Ladies\' T-shirt Navy M'           },
   { id => '#155413L', name => 'Ladies\' T-shirt Navy L'           },
   { id => '#155413X', name => 'Ladies\' T-shirt Navy XL'          },
-  { id => '#155343M', name => 'Unisex T-shirt Lapis M'            },
+  { id => '#190929L', name => 'Unisex T-shirt Lapis L'            },
   { id => '#155343X', name => 'Unisex T-shirt Lapis XL'           },
   { id => '#155414S', name => 'Ladies\' T-shirt Lapis S'          },
   { id => '#155414M', name => 'Ladies\' T-shirt Lapis M'          },
   { id => '#155414L', name => 'Ladies\' T-shirt Lapis L'          },
-  { id => '#155339' , name => 'Black Cap with Tote'               },
-  { id => '#155340' , name => 'Beanie'                            },
-  { id => '#155751' , name => 'Drawstring Tote'                   },
-  { id => '#155758' , name => 'Glossy Finish Ceramic Mug'         },
+  { id => '#155339' , name => 'Black Cap with Tote '              },
+  { id => '#155340' , name => 'Beanie '                           },
+  { id => '#155751' , name => 'Drawstring Tote '                  },
+  { id => '212669'  , name => 'Glossy Finish Ceramic Mug '        },
   { id => ''        , name => 'Splendid'                          },
-  { id => '#155754' , name => 'Mozilla Lanyard with Bulldog Clip' },
-  { id => '#155755' , name => 'Vertical Laminated Badge'          },
+  { id => '#197158' , name => '3" Firefox Sticker (single)'       },
+  { id => '#155754' , name => 'Lanyard with Bulldog Clip'         },
+  { id => '#197159' , name => 'Vertical Laminated Badge'          },
   { id => '#155756' , name => 'Silicone Wristband'                },
-  { id => '#155757' , name => 'Custom Tattoos - Pkg50'            },
+  { id => '#197156' , name => 'Custom Tattoos- Pkg50'             },
   { id => '#192150' , name => '1.25" Firefox Button-PKG25'        },
   { id => ''        , name => 'Firefox OS items'                  },
-  { id => '#197158' , name => '3" Round Sticker, Firefox logo'    },
-  { id => '#185686' , name => '3" Firefox OS Sticker Look Ahead'  },
-  { id => '#189674' , name => '3" Firefox OS Mobilizer'           },
+  { id => '#189674' , name => '3" Firefox OS Mobilizer Sticker'   },
   { id => '#187062' , name => 'OS Lanyard w/ Bulldog Clip'        },
   { id => '#180589' , name => 'Sunglasses Firefox OS'             },
   { id => '#180595' , name => 'Rubber Grip Pens Firefox OS'       },
@@ -86,11 +83,11 @@ mozspaces = [
   {
     name     => 'Berlin',
     address1 => 'MZ Denmark ApS - Germany',
-    address2 => 'Rungestrasse 22 - 24',
+    address2 => 'Voltastrasse 5 / Building (Haus) 10 / Stair (Treppe) 6 / 2nd floor.',
     city     => 'Berlin',
     state    => 'Germany',
     country  => 'Germany',
-    postcode => '10179',
+    postcode => '13355',
   },
   {
     name     => 'London',
@@ -104,11 +101,11 @@ mozspaces = [
   {
     name     => 'Mountain View',
     address1 => 'Mozilla',
-    address2 => '650 Castro St., Suite 300',
+    address2 => '331 E. Evelyn Ave.',
     city     => 'Mountain View',
     state    => 'CA',
     country  => 'USA',
-    postcode => '94041-2072',
+    postcode => '94041',
   },
   {
     name     => 'Paris',
-- 
cgit v1.2.3-24-g4f1b